aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-02-17 01:01:03 -0500
committerSage Weil <sage@newdream.net>2010-02-17 01:01:03 -0500
commite2663ab60de59d20fa33da3528f6d5359f8eb003 (patch)
treef167aba83280b6767e1f9bdf2e67e4ac48a85c68
parent153a008bf7915ea9127341409170cb197d111282 (diff)
ceph: allow connection to be reopened by fault callback
Fix the messenger to allow a ceph_con_open() during the fault callback. Previously the work wasn't getting queued on the connection because the fault path avoids requeued work (normally spurious). Loop on reopening by checking for the OPENING state bit. This fixes OSD reconnects when a TCP connection drops. Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--fs/ceph/messenger.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/messenger.c b/fs/ceph/messenger.c
index 44bdaf43992..acf383f6a9c 100644
--- a/fs/ceph/messenger.c
+++ b/fs/ceph/messenger.c
@@ -1808,7 +1808,7 @@ done:
1808 clear_bit(BUSY, &con->state); 1808 clear_bit(BUSY, &con->state);
1809 dout("con->state=%lu\n", con->state); 1809 dout("con->state=%lu\n", con->state);
1810 if (test_bit(QUEUED, &con->state)) { 1810 if (test_bit(QUEUED, &con->state)) {
1811 if (!backoff) { 1811 if (!backoff || test_bit(OPENING, &con->state)) {
1812 dout("con_work %p QUEUED reset, looping\n", con); 1812 dout("con_work %p QUEUED reset, looping\n", con);
1813 goto more; 1813 goto more;
1814 } 1814 }