From patchwork Mon Apr 23 17:04:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 10357675 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C3F3960225 for ; Mon, 23 Apr 2018 17:05:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5A4F28BD0 for ; Mon, 23 Apr 2018 17:05:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA2F128BD8; Mon, 23 Apr 2018 17:05:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 981A028BD0 for ; Mon, 23 Apr 2018 17:05:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755705AbeDWRFH (ORCPT ); Mon, 23 Apr 2018 13:05:07 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:36306 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755624AbeDWRFF (ORCPT ); Mon, 23 Apr 2018 13:05:05 -0400 Received: by mail-wr0-f193.google.com with SMTP id u18-v6so16021016wrg.3 for ; Mon, 23 Apr 2018 10:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=TgI+oddh7DGbS54tEcp1HgsBBxPpcMIqFKFRoUWv/KE=; b=HvdCb7hxB7+eivmAtcPTvIG18GoxR1ifgpQMTod4MQt/QpFe02u6bSPtH530D/1H1C IUSn31wMwZabm5hqmCw4aNOz+2GRbWFQ0AsqH1xqA/0Enhwl7p8XyBcTuV9LFWDeTPDu 8PnlWqTAoiU+GYfg9RCkBaMGsPK3FfDoEOmjoBiLWaor6zBZTCMzAJpoWNIrLL+ac9k/ uZ0w1nrr8+tFnWnpPhV6MUwOFrw3cguW0YNrih5peuJpnsbs1ep4NEPVy9XlJsocptLT DNgYO91x0gotj0l3xJ3sNG7j8bZsExQmGXCF2Tgu0zPWlS6I2Tjm75t2KzGLzWMlPNkK cJ7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=TgI+oddh7DGbS54tEcp1HgsBBxPpcMIqFKFRoUWv/KE=; b=DQwMku/oINZYET62rB878Tz1/0Ze73tvq6kmkVFNYKSfQCqgCR2vbogGkPAzTQCaMY yo33PEoMkEagx/d45VfAh4bbfY9jlFvXMyRXwayE/p5rM6PKnIYXo9MHlo9PocbHWYXl WPIVX1NtE6h9d8jCUG1qJ+cEjjxoYrl5FMW2s0T0ON7kuz2ElAF868aEwWS0ScBgeLXN /F+z+EOiYEuH2gZ9FZlD89nN2nf+VseXRIay+5ZSEoj9ZBii50DLO/nYJUvpRrgeyL08 YLHUHChLSe0O8dJzCmvJuhLbznZDtjWzOQRIKxj+awNqK4wVYAXi9/tzrsYqmWweYYjp 6Q0Q== X-Gm-Message-State: ALQs6tBeep0B72o9RYrZtfDWPfhMDcjRmQtR6zvfQxC+giBR/YDFF/i1 Cdb7qk36zQLSXTb6FwuprIEEdZbT X-Google-Smtp-Source: AB8JxZplmh8UjGg0B8QYKIEI2CBpjodSO1YdtHqNo+DlitT+hsLpQXGerSeRsNNY7gSqdstHuqH2HQ== X-Received: by 10.28.109.27 with SMTP id i27mr10402914wmc.109.1524503103813; Mon, 23 Apr 2018 10:05:03 -0700 (PDT) Received: from orange.brq.redhat.com. (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id b47-v6sm19029085wrg.13.2018.04.23.10.04.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Apr 2018 10:04:55 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 1/2] libceph: un-backoff on tick when we have a authenticated session Date: Mon, 23 Apr 2018 19:04:24 +0200 Message-Id: <1524503065-24623-2-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1524503065-24623-1-git-send-email-idryomov@gmail.com> References: <1524503065-24623-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-Virus-Scanned: ClamAV using ClamSMTP This means that if we do some backoff, then authenticate, and are healthy for an extended period of time, a subsequent failure won't leave us starting our hunting sequence with a large backoff. Mirrors ceph.git commit d466bc6e66abba9b464b0b69687cf45c9dccf383. Cc: stable@vger.kernel.org # 4.7+ Signed-off-by: Ilya Dryomov --- net/ceph/mon_client.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index b3dac24412d3..02c441c12c38 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -209,6 +209,14 @@ static void reopen_session(struct ceph_mon_client *monc) __open_session(monc); } +static void un_backoff(struct ceph_mon_client *monc) +{ + monc->hunt_mult /= 2; /* reduce by 50% */ + if (monc->hunt_mult < 1) + monc->hunt_mult = 1; + dout("%s hunt_mult now %d\n", __func__, monc->hunt_mult); +} + /* * Reschedule delayed work timer. */ @@ -963,6 +971,7 @@ static void delayed_work(struct work_struct *work) if (!monc->hunting) { ceph_con_keepalive(&monc->con); __validate_auth(monc); + un_backoff(monc); } if (is_auth && @@ -1123,9 +1132,7 @@ static void finish_hunting(struct ceph_mon_client *monc) dout("%s found mon%d\n", __func__, monc->cur_mon); monc->hunting = false; monc->had_a_connection = true; - monc->hunt_mult /= 2; /* reduce by 50% */ - if (monc->hunt_mult < 1) - monc->hunt_mult = 1; + un_backoff(monc); } }