From patchwork Mon Jan 25 11:29:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 8107101 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B71DE9F859 for ; Mon, 25 Jan 2016 11:30:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D948A202EB for ; Mon, 25 Jan 2016 11:30:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 14EC820256 for ; Mon, 25 Jan 2016 11:30:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756900AbcAYLaY (ORCPT ); Mon, 25 Jan 2016 06:30:24 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35317 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756742AbcAYLaS (ORCPT ); Mon, 25 Jan 2016 06:30:18 -0500 Received: by mail-wm0-f66.google.com with SMTP id 123so10693907wmz.2 for ; Mon, 25 Jan 2016 03:30:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=ZQ7Wxm1ue58/JCbCeoEBTmVibTeVb34D1qbNr5+7h2U=; b=En1lD8Zxjp0L8tHZ2ePhd12w+EX/Df61wPCYWfNXF3bDT6G8bhfIXbosLIhDGbRrdB vnGJE/DWcaKX0+UCF1uxWPLkrPaJ0N1frUDBLD+/9Pf1sYSWnBpZzrGKHJwV+anGF8LZ Siqa3waf83mjRL+po21zrD9aUOd/3fKurkPk2YQwp7IIDxLHXQK3wlTCxTB0oaTd8RBc IuAuT86OIjJhUN++zYElWOAzJj4MMq5dQDEk4mchPZhbCPQAN6zsjjvrV8+BhbIIf8jf /5mNOn5W/3/yIsT/khGBqGHnYFjnqNgB0gPfX7b1eWH1vk5/69Ot1hurWsW69CmfLDQO XgLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ZQ7Wxm1ue58/JCbCeoEBTmVibTeVb34D1qbNr5+7h2U=; b=MHG0x8L72mMga9l3XMEdUSH25D6M6+XwdOdzNQPmi534m7BhEMdaXZg+9EuHfFcz1U SOKkduUU+bAT/xhGQhdaVGmz9iEE0iTToYRAdPAknUEsfRwLR6rWgCiFnubm257Pl5aY qgBHh4GYnBu+K0kbMvBC4W9APDkOsedNGq0ATDT0T81XfyHPaJrTiPay8E18UsgRqDaG o90voviOPFk9DDXnwKqyRuy3Ac3zRMGcwvh54snmrH7GQiM/WSBxLCsD8dlvVX5Ven5B tJ3JzTgz/XXBPLgJb6Ae7Cof/5uCsZKkxspgr2idQB9WRTUBU1NsqpW0Xp547Mj09BCE GgsA== X-Gm-Message-State: AG10YOS0MoKIYWTYAZD3KO/W7PtxW7EHrc1rRvgT06AMf3253EembhOoeKDj7GKIoGrpYg== X-Received: by 10.194.123.103 with SMTP id lz7mr3530547wjb.140.1453721417395; Mon, 25 Jan 2016 03:30:17 -0800 (PST) Received: from localhost.localdomain.com (ip-78-102-114-179.net.upcbroadband.cz. [78.102.114.179]) by smtp.gmail.com with ESMTPSA id 75sm15796950wmo.22.2016.01.25.03.30.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jan 2016 03:30:16 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 8/9] libceph: reschedule tick in mon_fault() Date: Mon, 25 Jan 2016 12:29:40 +0100 Message-Id: <1453721381-20612-9-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1453721381-20612-1-git-send-email-idryomov@gmail.com> References: <1453721381-20612-1-git-send-email-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Doing __schedule_delayed() in the hunting branch is pointless, as the tick will have already been scheduled by then. What we need to do instead is *reschedule* it in the !hunting branch, after reopen_session() changes hunt_mult, which affects the delay. This helps with spacing out connection attempts and avoiding things like two back-to-back attempts followed by a longer period of waiting around. Signed-off-by: Ilya Dryomov --- net/ceph/mon_client.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index 816fb813a336..a2b45cf79dca 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -222,8 +222,8 @@ static void __schedule_delayed(struct ceph_mon_client *monc) delay = CEPH_MONC_PING_INTERVAL; dout("__schedule_delayed after %lu\n", delay); - schedule_delayed_work(&monc->delayed_work, - round_jiffies_relative(delay)); + mod_delayed_work(system_wq, &monc->delayed_work, + round_jiffies_relative(delay)); } const char *ceph_sub_str[] = { @@ -1166,9 +1166,9 @@ static void mon_fault(struct ceph_connection *con) if (!monc->hunting) { dout("%s hunting for new mon\n", __func__); reopen_session(monc); - } else { - /* already hunting, let's wait a bit */ __schedule_delayed(monc); + } else { + dout("%s already hunting\n", __func__); } out: mutex_unlock(&monc->mutex);