From: Sage Weil <sage@inktank.com>
Date: Mon, 30 Jul 2012 23:22:05 +0000 (-0700)
Subject: libceph: reset connection retry on successfully negotiation
X-Git-Tag: v3.4.20~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ed447f04ee3240371aa8a199588107fd521240d3;p=karo-tx-linux.git

libceph: reset connection retry on successfully negotiation

(cherry picked from commit 85effe183dd45854d1ad1a370b88cddb403c4c91)

We exponentially back off when we encounter connection errors.  If several
errors accumulate, we will eventually wait ages before even trying to
reconnect.

Fix this by resetting the backoff counter after a successful negotiation/
connection with the remote node.  Fixes ceph issue #2802.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index b59e64a7b24b..9da18929c588 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -1629,6 +1629,8 @@ static int process_connect(struct ceph_connection *con)
 		if (con->in_reply.flags & CEPH_MSG_CONNECT_LOSSY)
 			set_bit(LOSSYTX, &con->flags);
 
+		con->delay = 0;      /* reset backoff memory */
+
 		prepare_read_tag(con);
 		break;