]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Revert "msg/async/ProtocolV2: call KeepAliveFrameAck::Encode() without `write_lock`"
authorLaura Flores <lflores@ibm.com>
Thu, 6 Feb 2025 17:57:09 +0000 (11:57 -0600)
committerLaura Flores <lflores@ibm.com>
Thu, 6 Feb 2025 17:57:09 +0000 (11:57 -0600)
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>
src/msg/async/ProtocolV2.cc

index 55481056c60672bf5707b7e69e3499f9e13df044..ed6f93cdd481065f86c2b2bf8d3aecd2747aa45f 100644 (file)
@@ -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();