From 61ea32441d42790a18bbc9b378c3352ca9f6d04e Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Wed, 11 Dec 2019 10:13:12 +0100 Subject: [PATCH] crimson: pass real connection in OpsExecuter::do_op_watch_subop_watch() Signed-off-by: Radoslaw Zarzynski --- src/crimson/osd/ops_executer.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/crimson/osd/ops_executer.cc b/src/crimson/osd/ops_executer.cc index e24af56dc3d..130663dd9ef 100644 --- a/src/crimson/osd/ops_executer.cc +++ b/src/crimson/osd/ops_executer.cc @@ -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 */); }); }