msgr: remove the Pipe::disposable flag.

It has no function as it stands. It was intended for new connections
to avoid being marked lossy, but that can't happen anyway.
So... *shrug*

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

2 files changed, 4 insertions, 11 deletions

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 9f1d09ec638..6ee0cc963ff 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -1286,9 +1286,7 @@ int SimpleMessenger::Pipe::connect()
 
       // hooray!
       peer_global_seq = reply.global_seq;
-      if (!disposable) {
-	policy.lossy = reply.flags & CEPH_MSG_CONNECT_LOSSY;
-      }
+      policy.lossy = reply.flags & CEPH_MSG_CONNECT_LOSSY;
       state = STATE_OPEN;
       connect_seq = cseq + 1;
       assert(connect_seq == reply.connect_seq);
@@ -2738,7 +2736,6 @@ void SimpleMessenger::mark_disposable(Connection *con)
     assert(p->msgr == this);
     p->pipe_lock.Lock();
     p->policy.lossy = true;
-    p->disposable = true;
     p->pipe_lock.Unlock();
     p->put();
   } else {
diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 2c1cf057586..0cc05966cfc 100644
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -350,11 +350,8 @@ public:
    * delivery semantics, either.
    * You can compose this with mark_down, in which case the Pipe
    * will make sure to send all Messages and wait for an ack before
-   * closing, but if there's a failure it will simply shut down.
-   *
-   * TODO: There's some odd stuff going on in our SimpleMessenger
-   * implementation during connect that looks unused; is there
-   * more of a contract that that's enforcing?
+   * closing, but if there's a failure it will simply shut down. It
+   * does not generate any notifications to the Dispatcher.
    *
    * @param con The Connection to mark as disposable.
    */
@@ -447,7 +444,7 @@ private:
       connection_state(new Connection),
       reader_running(false), reader_joining(false), writer_running(false),
       in_qlen(0), keepalive(false), halt_delivery(false),
-      close_on_empty(false), disposable(false),
+      close_on_empty(false),
       connect_seq(0), peer_global_seq(0),
       out_seq(0), in_seq(0), in_seq_acked(0) {
       connection_state->pipe = get();
@@ -507,7 +504,6 @@ private:
     bool keepalive;
     bool halt_delivery; //if a pipe's queue is destroyed, stop adding to it
     bool close_on_empty;
-    bool disposable;
     
     __u32 connect_seq, peer_global_seq;
     uint64_t out_seq;