msg/Pipe: discard_queue() -> discard_out_queue()

We only discard outgoing messages; incoming messages are handled by the
IncomingQueue.. but this method doesn't touch that.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index d0d6aab081bb3cab8952e922af86f49416cd5fa9..1c9eeff2defb4b620cb3a49dbd9ae57b6065c318 100644 (file)
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -934,7 +934,7 @@ void Pipe::requeue_sent(uint64_t max_acked)
  * Tears down the Pipe's message queues, and removes them from the DispatchQueue
  * Must hold pipe_lock prior to calling.
  */
-void Pipe::discard_queue()
+void Pipe::discard_out_queue()
 {
   ldout(msgr->cct,10) << "discard_queue" << dendl;
 
@@ -994,7 +994,7 @@ void Pipe::fault(bool onconnect, bool onread)
     msgr->lock.Unlock();
 
     in_q->discard_queue();
-    discard_queue();
+    discard_out_queue();
 
     // disconnect from Connection, and mark it failed.  future messages
     // will be dropped.
@@ -1053,7 +1053,7 @@ void Pipe::was_session_reset()
 
   ldout(msgr->cct,10) << "was_session_reset" << dendl;
   in_q->discard_queue();
-  discard_queue();
+  discard_out_queue();
 
   msgr->dispatch_queue.queue_remote_reset(connection_state);
 

diff --git a/src/msg/Pipe.h b/src/msg/Pipe.h
index 40f7518d636964d9fa126f440f6d11015cf38635..df72c4240a53a76ab78750c46b8d1d6250338251 100644 (file)
--- a/src/msg/Pipe.h
+++ b/src/msg/Pipe.h
@@ -231,7 +231,7 @@ class DispatchQueue;
     /* Remove all messages from the sent queue. Add those with seq > max_acked
      * to the highest priority outgoing queue. */
     void requeue_sent(uint64_t max_acked=0);
-    void discard_queue();
+    void discard_out_queue();
 
     void shutdown_socket() {
       if (sd >= 0)

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 403c37eb84993a4704a66ea9c2b4fee3e931acc2..eaad6fe31ac5e15ccd2f19e78e8e77a4258dc0f7 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -214,7 +214,7 @@ void SimpleMessenger::reaper()
     pipe_reap_queue.pop_front();
     ldout(cct,10) << "reaper reaping pipe " << p << " " << p->get_peer_addr() << dendl;
     p->pipe_lock.Lock();
-    p->discard_queue();
+    p->discard_out_queue();
     p->pipe_lock.Unlock();
     p->unregister_pipe();
     assert(pipes.count(p));