]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msgr: make standby an allowable connection race state
authorSage Weil <sage@newdream.net>
Thu, 2 Oct 2008 19:58:06 +0000 (12:58 -0700)
committerSage Weil <sage@newdream.net>
Thu, 2 Oct 2008 20:11:55 +0000 (13:11 -0700)
src/msg/SimpleMessenger.cc

index 0495d2e5e753e776d65ef61e50476cbc8ade5c10..3af3cfa84ecf6ca0ebb254f23fd698e4b9eac90e 100644 (file)
@@ -886,6 +886,7 @@ int Rank::Pipe::accept()
          dout(10) << "accept connection race, existing " << existing << ".cseq " << existing->connect_seq
                   << " == " << connect.connect_seq << ", replacing my attempt" << dendl;
          assert(existing->state == STATE_CONNECTING ||
+                existing->state == STATE_STANDBY ||
                 existing->state == STATE_WAIT);
          goto replace;
        } else {