From: Laura Flores <lflores@ibm.com>
Date: Thu, 6 Feb 2025 17:57:09 +0000 (-0600)
Subject: Revert "msg/async/ProtocolV2: call KeepAliveFrameAck::Encode() without `write_lock`"
X-Git-Tag: v20.0.0~220^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F61677%2Fhead;p=ceph.git

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 <lflores@ibm.com>
---

diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index 55481056c606..ed6f93cdd481 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();