From: Samuel Just <sam.just@inktank.com>
Date: Tue, 2 Oct 2012 23:34:50 +0000 (-0700)
Subject: Pipe: we don't queue DispatchQueue codes on an actual pipe
X-Git-Tag: v0.55~115^3~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbdae98115f6ffe324fe36846789c24eb4f530db;p=ceph.git

Pipe: we don't queue DispatchQueue codes on an actual pipe

The dispatch queue event codes are now queued directly and
won't end up in a real Pipe.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index c7d549a67357..9c198104a738 100644
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -1007,18 +1007,12 @@ void Pipe::discard_out_queue()
   ldout(msgr->cct,10) << "discard_queue" << dendl;
 
   for (list<Message*>::iterator p = sent.begin(); p != sent.end(); p++) {
-    if (*p < (void *) DispatchQueue::D_NUM_CODES) {
-      continue; // skip non-Message dispatch codes
-    }
     ldout(msgr->cct,20) << "  discard " << *p << dendl;
     (*p)->put();
   }
   sent.clear();
   for (map<int,list<Message*> >::iterator p = out_q.begin(); p != out_q.end(); p++)
     for (list<Message*>::iterator r = p->second.begin(); r != p->second.end(); r++) {
-      if (*r < (void *) DispatchQueue::D_NUM_CODES) {
-        continue; // skip non-Message dispatch codes
-      }
       ldout(msgr->cct,20) << "  discard " << *r << dendl;
       (*r)->put();
     }