Merge pull request ceph#61677 from ljflores/wip-revert-pr-60176

Revert PR 60176

Author: ljflores

src/msg/async/ProtocolV1.cc

@@ -222,7 +222,7 @@ void ProtocolV1::send_message(Message *m) {
     is_prepared = true;
   }
 
-  std::unique_lock l{connection->write_lock};
+  std::lock_guard<std::mutex> l(connection->write_lock);
   // "features" changes will change the payload encoding
   if (can_fast_prepare &&
       (can_write == WriteStatus::NOWRITE || connection->get_features() != f)) {
@@ -245,11 +245,6 @@ void ProtocolV1::send_message(Message *m) {
                    << dendl;
     if (can_write != WriteStatus::REPLACING && !write_in_progress) {
       write_in_progress = true;
-
-      /* unlock the mutex now because dispatch_event_external() may
-         block waiting for another mutex */
-      l.unlock();
-
       connection->center->dispatch_event_external(connection->write_handler);
     }
   }
@@ -275,14 +270,9 @@ void ProtocolV1::prepare_send_message(uint64_t features, Message *m,
 
 void ProtocolV1::send_keepalive() {
   ldout(cct, 10) << __func__ << dendl;
-  std::unique_lock l{connection->write_lock};
+  std::lock_guard<std::mutex> l(connection->write_lock);
   if (can_write != WriteStatus::CLOSED) {
     keepalive = true;
-
-    /* unlock the mutex now because dispatch_event_external() may
-       block waiting for another mutex */
-    l.unlock();
-
     connection->center->dispatch_event_external(connection->write_handler);
   }
 }

src/msg/async/ProtocolV2.cc

@@ -440,7 +440,7 @@ void ProtocolV2::send_message(Message *m) {
     is_prepared = false;
   }
 
-  std::unique_lock l{connection->write_lock};
+  std::lock_guard<std::mutex> l(connection->write_lock);
   // "features" changes will change the payload encoding
   if (can_fast_prepare && (!can_write || connection->get_features() != f)) {
     // ensure the correctness of message encoding
@@ -464,26 +464,16 @@ void ProtocolV2::send_message(Message *m) {
                    << dendl;
     if (((!replacing && can_write) || state == STANDBY) && !write_in_progress) {
       write_in_progress = true;
-
-      /* unlock the mutex now because dispatch_event_external() may
-         block waiting for another mutex */
-      l.unlock();
-
       connection->center->dispatch_event_external(connection->write_handler);
     }
   }
 }
 
 void ProtocolV2::send_keepalive() {
   ldout(cct, 10) << __func__ << dendl;
-  std::unique_lock l{connection->write_lock};
+  std::lock_guard<std::mutex> l(connection->write_lock);
   if (state != CLOSED) {
     keepalive = true;
-
-    /* unlock the mutex now because dispatch_event_external() may
-       block waiting for another mutex */
-    l.unlock();
-
     connection->center->dispatch_event_external(connection->write_handler);
   }
 }
@@ -1653,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();