From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 14 Feb 2019 20:02:52 +0000 (+0100)
Subject: msg/async: V2 bypasses throttles just for development.
X-Git-Tag: v14.1.1~157^2~27
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e0741e682d2214f9c33d96a252d47c07ba500daa;p=ceph-ci.git

msg/async: V2 bypasses throttles just for development.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index c0f17ddb2d7..74e45fbe2a7 100644
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -713,6 +713,7 @@ void ProtocolV2::reset_recv_state() {
   uint32_t cur_msg_size = current_header.front_len + current_header.middle_len +
                           current_header.data_len;
 
+#if 0
   if (state > THROTTLE_MESSAGE && state <= READ_MESSAGE_FRONT &&
       connection->policy.throttler_messages) {
     ldout(cct, 10) << __func__ << " releasing " << 1
@@ -739,6 +740,7 @@ void ProtocolV2::reset_recv_state() {
         << connection->dispatch_queue->dispatch_throttler.get_max() << dendl;
     connection->dispatch_queue->dispatch_throttle_release(cur_msg_size);
   }
+#endif
 }
 
 CtPtr ProtocolV2::_fault() {
@@ -1714,8 +1716,13 @@ CtPtr ProtocolV2::handle_message_header(char *buffer, int r) {
 
   next_payload_len -= header_len;
 
+#if 0
   state = THROTTLE_MESSAGE;
   return CONTINUE(throttle_message);
+#else
+  state = READ_MESSAGE_FRONT;
+  return read_message_front();
+#endif
 }
 
 CtPtr ProtocolV2::throttle_message() {
@@ -2008,15 +2015,19 @@ CtPtr ProtocolV2::handle_message_complete() {
 
   INTERCEPT(17);
 
+#if 0
   message->set_byte_throttler(connection->policy.throttler_bytes);
   message->set_message_throttler(connection->policy.throttler_messages);
+#endif
 
   uint32_t cur_msg_size = current_header.front_len + current_header.middle_len +
                           current_header.data_len;
 
+#if 0
   // store reservation size in message, so we don't get confused
   // by messages entering the dispatch queue through other paths.
   message->set_dispatch_throttle_size(cur_msg_size);
+#endif
 
   message->set_recv_stamp(recv_stamp);
   message->set_throttle_stamp(throttle_stamp);