]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson: pass real connection in OpsExecuter::do_op_watch_subop_watch()
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 11 Dec 2019 09:13:12 +0000 (10:13 +0100)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 13 Feb 2020 23:11:39 +0000 (00:11 +0100)
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/osd/ops_executer.cc

index e24af56dc3d0f5e9783bb888e21aff20b0f46bd2..130663dd9ef41b005a9828ffea4c95c35c5bb624 100644 (file)
@@ -131,10 +131,12 @@ OpsExecuter::watch_errorator::future<> OpsExecuter::do_op_watch_subop_watch(
 {
   struct connect_ctx_t {
     ObjectContext::watch_key_t key;
+    crimson::net::ConnectionRef conn;
     watch_info_t info;
 
     connect_ctx_t(const OSDOp& osd_op, const MOSDOp& msg)
       : key(osd_op.op.watch.cookie, msg.get_reqid().name),
+        conn(msg.get_connection()),
         info(create_watch_info(osd_op, msg)) {
     }
   };
@@ -159,7 +161,7 @@ OpsExecuter::watch_errorator::future<> OpsExecuter::do_op_watch_subop_watch(
       } else {
         logger().info("op_effect: found existing watcher: {}", ctx.key);
       }
-      return it->second->connect(nullptr /* conn */, true /* will_ping */);
+      return it->second->connect(std::move(ctx.conn), true /* will_ping */);
     });
 }