crimson/net: allow REPLACING state wait for protocol exit

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc
index 76e0f150889445ad60e8e0e04f26f1e43fa8e545..79023d32838e8734401d464bb95246d8d091e29d 100644 (file)
--- a/src/crimson/net/ProtocolV2.cc
+++ b/src/crimson/net/ProtocolV2.cc
@@ -843,7 +843,7 @@ void ProtocolV2::execute_connecting()
   if (socket) {
     socket->shutdown();
   }
-  seastar::with_gate(pending_dispatch, [this] {
+  execution_done = seastar::with_gate(pending_dispatch, [this] {
       // we don't know my socket_port yet
       conn.set_ephemeral_port(0, SocketConnection::side_t::none);
       return messenger.get_global_seq().then([this] (auto gs) {
@@ -1683,7 +1683,7 @@ seastar::future<> ProtocolV2::read_message(utime_t throttle_stamp)
 void ProtocolV2::execute_ready()
 {
   trigger_state(state_t::READY, write_state_t::open, false);
-  seastar::with_gate(pending_dispatch, [this] {
+  execution_done = seastar::with_gate(pending_dispatch, [this] {
     return seastar::keep_doing([this] {
       return read_main_preamble()
       .then([this] (Tag tag) {

diff --git a/src/crimson/net/ProtocolV2.h b/src/crimson/net/ProtocolV2.h
index 3bd31af724896f08b43343b0ad79655822434ee8..bce428c6297eb931436cff1236b4ea563ee8d17f 100644 (file)
--- a/src/crimson/net/ProtocolV2.h
+++ b/src/crimson/net/ProtocolV2.h
@@ -72,6 +72,8 @@ class ProtocolV2 final : public Protocol {
   uint64_t peer_global_seq = 0;
   uint64_t connect_seq = 0;
 
+  seastar::future<> execution_done = seastar::now();
+
  // TODO: Frame related implementations, probably to a separate class.
  private:
   bool record_io = false;