msg/async, v2: READ_MESSAGE_FRONT -> THROTTLE_DONE.

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

diff --git a/src/msg/async/ProtocolV2.cc b/src/msg/async/ProtocolV2.cc
index 2a6eb2fc3fd28cf2a5e0642cfb67db8620042a36..1b1a274768afb82d667c55bb97af918e4e2840aa 100644 (file)
--- a/src/msg/async/ProtocolV2.cc
+++ b/src/msg/async/ProtocolV2.cc
@@ -721,7 +721,7 @@ void ProtocolV2::reset_recv_state() {
                           current_header.data_len;
 
 #if 0
-  if (state > THROTTLE_MESSAGE && state <= READ_MESSAGE_FRONT &&
+  if (state > THROTTLE_MESSAGE && state <= THROTTLE_DONE &&
       connection->policy.throttler_messages) {
     ldout(cct, 10) << __func__ << " releasing " << 1
                    << " message to policy throttler "
@@ -730,7 +730,7 @@ void ProtocolV2::reset_recv_state() {
                    << dendl;
     connection->policy.throttler_messages->put();
   }
-  if (state > THROTTLE_BYTES && state <= READ_MESSAGE_FRONT) {
+  if (state > THROTTLE_BYTES && state <= THROTTLE_DONE) {
     if (connection->policy.throttler_bytes) {
       ldout(cct, 10) << __func__ << " releasing " << cur_msg_size
                      << " bytes to policy throttler "
@@ -739,7 +739,7 @@ void ProtocolV2::reset_recv_state() {
       connection->policy.throttler_bytes->put(cur_msg_size);
     }
   }
-  if (state > THROTTLE_DISPATCH_QUEUE && state <= READ_MESSAGE_FRONT) {
+  if (state > THROTTLE_DISPATCH_QUEUE && state <= THROTTLE_DONE) {
     ldout(cct, 10)
         << __func__ << " releasing " << cur_msg_size
         << " bytes to dispatch_queue throttler "
@@ -2089,8 +2089,8 @@ CtPtr ProtocolV2::throttle_dispatch_queue() {
   }
 
   throttle_stamp = ceph_clock_now();
+  state = THROTTLE_DONE;
 
-  state = READ_MESSAGE_FRONT;
   return read_message_data_prepare();
 }
 

diff --git a/src/msg/async/ProtocolV2.h b/src/msg/async/ProtocolV2.h
index 8d556e08ab26e6fc7e69c889d169b973bb7af6c3..99637b042bd54a49632ca142e28d2ef7b14948a2 100644 (file)
--- a/src/msg/async/ProtocolV2.h
+++ b/src/msg/async/ProtocolV2.h
@@ -22,7 +22,7 @@ private:
     THROTTLE_MESSAGE,
     THROTTLE_BYTES,
     THROTTLE_DISPATCH_QUEUE,
-    READ_MESSAGE_FRONT,
+    THROTTLE_DONE,
     READ_MESSAGE_COMPLETE,
     STANDBY,
     WAIT,
@@ -40,7 +40,7 @@ private:
                                       "THROTTLE_MESSAGE",
                                       "THROTTLE_BYTES",
                                       "THROTTLE_DISPATCH_QUEUE",
-                                      "READ_MESSAGE_FRONT",
+                                      "THROTTLE_DONE",
                                       "READ_MESSAGE_COMPLETE",
                                       "STANDBY",
                                       "WAIT",