From bc03c5bac47cd8a6bd7f39c765ec75ecb89eeac6 Mon Sep 17 00:00:00 2001 From: Laura Flores Date: Thu, 6 Feb 2025 11:57:09 -0600 Subject: [PATCH] Revert "msg/async/ProtocolV2: call KeepAliveFrameAck::Encode() without `write_lock`" This reverts commit e2798ecb69b1d60c5dc1a90c9d65cb79f11a5e22. The PR was merged accidentally after there were regressions discovered in teuthology testing. Signed-off-by: Laura Flores --- src/msg/async/ProtocolV2.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc index 55481056c60..ed6f93cdd48 100644 --- a/src/msg/async/ProtocolV2.cc +++ b/src/msg/async/ProtocolV2.cc @@ -1643,8 +1643,8 @@ CtPtr ProtocolV2::handle_keepalive2(ceph::bufferlist &payload) ldout(cct, 30) << __func__ << " got KEEPALIVE2 tag ..." << dendl; - auto keepalive_ack_frame = KeepAliveFrameAck::Encode(keepalive_frame.timestamp()); connection->write_lock.lock(); + auto keepalive_ack_frame = KeepAliveFrameAck::Encode(keepalive_frame.timestamp()); if (!append_frame(keepalive_ack_frame)) { connection->write_lock.unlock(); return _fault(); -- 2.39.5