]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Pipe: Drop connect_seq increase line 5908/head
authorHaomai Wang <haomaiwang@gmail.com>
Wed, 25 Feb 2015 15:38:54 +0000 (23:38 +0800)
committerSage Weil <sage@redhat.com>
Sun, 13 Sep 2015 13:28:50 +0000 (09:28 -0400)
Revert commit 0fc47e267b6f8dcd4511d887d5ad37d460374c25.

When accepting and "connect.connect_seq == existing->connect_seq",
existing->state maybe STATE_OPEN, STATE_STANDBY or STANDY_CONNECTING.
This commit only fix partial problem and want to assert
"(existing->state == STATE_CONNECTING)".

So later we added codes to catch
"(existing->state == STATE_OPEN || existing->state == STATE_STANDBY)"
before asserting.

Backport: dumpling, firefly, giant

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 67225cb3ee1f6d274a02293724942bdb25cec8ca)

src/msg/simple/Pipe.cc

index f5d8a362a2983fb2df0300aa9f51869baa75b888..ab277e08872c41b95d69f105bd8ff1616e743b31 100644 (file)
@@ -1694,10 +1694,8 @@ void Pipe::writer()
                        << " policy.server=" << policy.server << dendl;
 
     // standby?
-    if (is_queued() && state == STATE_STANDBY && !policy.server) {
-      connect_seq++;
+    if (is_queued() && state == STATE_STANDBY && !policy.server)
       state = STATE_CONNECTING;
-    }
 
     // connect?
     if (state == STATE_CONNECTING) {