From patchwork Fri Feb 22 17:23:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 2176691 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 30D79DFABD for ; Fri, 22 Feb 2013 17:23:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758027Ab3BVRXV (ORCPT ); Fri, 22 Feb 2013 12:23:21 -0500 Received: from mail-ie0-f181.google.com ([209.85.223.181]:47920 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757929Ab3BVRXU (ORCPT ); Fri, 22 Feb 2013 12:23:20 -0500 Received: by mail-ie0-f181.google.com with SMTP id 17so981351iea.26 for ; Fri, 22 Feb 2013 09:23:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=tAPGjnMVa2SS1L4HX4ztfBH/MlSKQ045huY1/KpHjeI=; b=kITHlq9zHZ3uydGlkXZSF0C98rKpRTpyTWK+sJyx+tkfkipq/wMYeBlvGSodsQGbN+ J5b+8mhYPkBcrLfSaDt8cHzGozGNBQVVUi+ikA49pcliZ2Nnptknmb8wG45sYZHVKkal brnIgfLrPPR212BH8Qf/yB6ODs5qwL1FndajVcYyQ1sY0hGs9a+DcOe1+l8q/7yihgXo 5crmQ9WOQ4VC2yMHxPZbpLiEm1q00UdGUsAp83KfqiT8WsosUzo3WF5m4BVbii7MprJj Fiv+Ry+mGdgJSLPtAej9PTK3elIvWGBW4K7qE2+rqkmXOLf+QuIn7+rmMHPYy0axctLk BLVA== X-Received: by 10.50.212.74 with SMTP id ni10mr1244542igc.60.1361553800386; Fri, 22 Feb 2013 09:23:20 -0800 (PST) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id v5sm2242337igw.1.2013.02.22.09.23.17 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Feb 2013 09:23:18 -0800 (PST) Message-ID: <5127A985.3070305@inktank.com> Date: Fri, 22 Feb 2013 11:23:17 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org >> ceph-devel" Subject: [PATCH 1/5] libceph: encapsulate connection backoff References: <5127A85D.1070000@inktank.com> <5127A935.8020605@inktank.com> In-Reply-To: <5127A935.8020605@inktank.com> X-Gm-Message-State: ALoCoQk/Sbqh3OxcAcFeEdhYO1ie95vv2YIBNZDkCl0k6q3nE8yveO5oEv01iByflxfDau7nnmXR Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Collect the code that tests for and implements a backoff delay for a ceph connection into a new function, ceph_backoff(). Make the debug output messages in that part of the code report things consistently by reporting a message in the socket closed case, and by making the one for PREOPEN state report the connection pointer like the rest. Signed-off-by: Alex Elder --- v2: rebased net/ceph/messenger.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) */ @@ -2356,21 +2374,14 @@ static void con_work(struct work_struct *work) mutex_lock(&con->mutex); restart: - if (con_sock_closed(con)) + if (con_sock_closed(con)) { + dout("%s: con %p SOCK_CLOSED\n", __func__, con); goto fault; - - if (con_flag_test_and_clear(con, CON_FLAG_BACKOFF)) { - dout("con_work %p backing off\n", con); - ret = queue_con_delay(con, round_jiffies_relative(con->delay)); - if (ret) { - dout("con_work %p FAILED to back off %lu\n", con, - con->delay); - BUG_ON(ret == -ENOENT); - con_flag_set(con, CON_FLAG_BACKOFF); - } + } + if (con_backoff(con)) { + dout("%s: con %p BACKOFF\n", __func__, con); goto done; } - if (con->state == CON_STATE_STANDBY) { dout("con_work %p STANDBY\n", con); goto done; @@ -2381,7 +2392,7 @@ restart: goto done; } if (con->state == CON_STATE_PREOPEN) { - dout("con_work OPENING\n"); + dout("%s: con %p OPENING\n", __func__, con); BUG_ON(con->sock); } diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index ed9e237..9a29d8a 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2345,6 +2345,24 @@ static bool con_sock_closed(struct ceph_connection *con) return true; } +static bool con_backoff(struct ceph_connection *con) +{ + int ret; + + if (!con_flag_test_and_clear(con, CON_FLAG_BACKOFF)) + return false; + + ret = queue_con_delay(con, round_jiffies_relative(con->delay)); + if (ret) { + dout("%s: con %p FAILED to back off %lu\n", __func__, + con, con->delay); + BUG_ON(ret == -ENOENT); + con_flag_set(con, CON_FLAG_BACKOFF); + } + + return true; +} + /* * Do some work on a connection. Drop a connection ref when we're done.