Skip to content

Commit bc03c5b

Browse files
author
Laura Flores
committed
Revert "msg/async/ProtocolV2: call KeepAliveFrameAck::Encode() without write_lock"
This reverts commit e2798ec. The PR was merged accidentally after there were regressions discovered in teuthology testing. Signed-off-by: Laura Flores <[email protected]>
1 parent 3646e24 commit bc03c5b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/msg/async/ProtocolV2.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1643,8 +1643,8 @@ CtPtr ProtocolV2::handle_keepalive2(ceph::bufferlist &payload)
16431643

16441644
ldout(cct, 30) << __func__ << " got KEEPALIVE2 tag ..." << dendl;
16451645

1646-
auto keepalive_ack_frame = KeepAliveFrameAck::Encode(keepalive_frame.timestamp());
16471646
connection->write_lock.lock();
1647+
auto keepalive_ack_frame = KeepAliveFrameAck::Encode(keepalive_frame.timestamp());
16481648
if (!append_frame(keepalive_ack_frame)) {
16491649
connection->write_lock.unlock();
16501650
return _fault();

0 commit comments

Comments
 (0)