Comments
Patch
@@ -1559,7 +1559,6 @@ static int process_connect(struct ceph_connection *con)
return -1;
}
clear_bit(NEGOTIATING, &con->state);
- clear_bit(CONNECTING, &con->state);
set_bit(CONNECTED, &con->state);
con->peer_global_seq = le32_to_cpu(con->in_reply.global_seq);
con->connect_seq++;
@@ -2000,7 +1999,8 @@ more_kvec:
}
do_next:
- if (!test_bit(CONNECTING, &con->state)) {
+ if (!test_bit(CONNECTING, &con->state) &&
+ !test_bit(NEGOTIATING, &con->state)) {
/* is anything else pending? */
if (!list_empty(&con->out_queue)) {
prepare_write_message(con);
@@ -2057,25 +2057,29 @@ more:
}
if (test_bit(CONNECTING, &con->state)) {
- if (!test_bit(NEGOTIATING, &con->state)) {
- dout("try_read connecting\n");
- ret = read_partial_banner(con);
- if (ret <= 0)
- goto out;
- ret = process_banner(con);
- if (ret < 0)
- goto out;
-
- /* Banner is good, exchange connection info */
- ret = prepare_write_connect(con);
- if (ret < 0)
- goto out;
- prepare_read_connect(con);
- set_bit(NEGOTIATING, &con->state);
-
- /* Send connection info before awaiting response */
+ dout("try_read connecting\n");
+ ret = read_partial_banner(con);
+ if (ret <= 0)
goto out;
- }
+ ret = process_banner(con);
+ if (ret < 0)
+ goto out;
+
+ clear_bit(CONNECTING, &con->state);
+ set_bit(NEGOTIATING, &con->state);
+
+ /* Banner is good, exchange connection info */
+ ret = prepare_write_connect(con);
+ if (ret < 0)
+ goto out;
+ prepare_read_connect(con);
+
+ /* Send connection info before awaiting response */
+ goto out;
+ }
+
+ if (test_bit(NEGOTIATING, &con->state)) {
+ dout("try_read negotiating\n");
ret = read_partial_connect(con);
if (ret <= 0)
goto out;
@@ -2197,12 +2201,12 @@ restart:
if (test_and_clear_bit(SOCK_CLOSED, &con->flags)) {
if (test_and_clear_bit(CONNECTED, &con->state))
con->error_msg = "socket closed";
- else if (test_and_clear_bit(CONNECTING, &con->state)) {
- clear_bit(NEGOTIATING, &con->state);
+ else if (test_and_clear_bit(NEGOTIATING, &con->state))
+ con->error_msg = "negotiation failed";
+ else if (test_and_clear_bit(CONNECTING, &con->state))
con->error_msg = "connection failed";
- } else {
+ else
con->error_msg = "unrecognized con state";
- }
goto fault;
}
This is a note to let you know that I have just added a patch titled libceph: distinguish two phases of connect sequence to the linux-3.5.y-queue branch of the 3.5.yuz extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.yuz tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ From 1ea675278d508ac2861f1a8c6c384ad25abe774f Mon Sep 17 00:00:00 2001 From: Alex Elder <elder@inktank.com> Date: Thu, 24 May 2012 11:55:03 -0500 Subject: [PATCH 40/78] libceph: distinguish two phases of connect sequence commit 7593af920baac37752190a0db703d2732bed4a3b upstream. Currently a ceph connection enters a "CONNECTING" state when it begins the process of (re-)connecting with its peer. Once the two ends have successfully exchanged their banner and addresses, an additional NEGOTIATING bit is set in the ceph connection's state to indicate the connection information exhange has begun. The CONNECTING bit/state continues to be set during this phase. Rather than have the CONNECTING state continue while the NEGOTIATING bit is set, interpret these two phases as distinct states. In other words, when NEGOTIATING is set, clear CONNECTING. That way only one of them will be active at a time. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> --- net/ceph/messenger.c | 52 +++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 24 deletions(-) -- 1.7.9.5