Revert "msgr: Test reconnect protocol changes."

This reverts commit 7349bce8a304231855468503eb32d0167d6955bb.
Only testing; we don't want it live! But keep in-tree.

diff --git a/src/config.cc b/src/config.cc
index 3f88bb8c4d40d568e5f666a9691bac3ee82737b4..2b69af13b02eed87b43f492f83da1a3a5ff82a96 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -280,7 +280,7 @@ static struct config_option config_optionsp[] = {
        OPTION(fake_clock, 0, OPT_BOOL, false),
        OPTION(fakemessenger_serialize, 0, OPT_BOOL, true),
        OPTION(kill_after, 0, OPT_INT, 0),
-       OPTION(debug, 0, OPT_INT, 1),
+       OPTION(debug, 0, OPT_INT, 0),
        OPTION(debug_lockdep, 0, OPT_INT, 0),
        OPTION(debug_mds, 0, OPT_INT, 1),
        OPTION(debug_mds_balancer, 0, OPT_INT, 1),

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 6c64ce20d507d7d17100e78e19f0f24c68f3a731..f4a460160c0fe7e3d14520f9e714e34923c1ce80 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -146,12 +146,12 @@ struct RefCountedObject {
   virtual ~RefCountedObject() {}
   
   RefCountedObject *get() {
-    generic_dout(1) << "RefCountedObject::get " << this << " " << nref.read() << " -> " << (nref.read() + 1) << dendl;
+    //generic_dout(0) << "RefCountedObject::get " << this << " " << nref.read() << " -> " << (nref.read() + 1) << dendl;
     nref.inc();
     return this;
   }
   void put() {
-    generic_dout(1) << "RefCountedObject::put " << this << " " << nref.read() << " -> " << (nref.read() - 1) << dendl;
+    //generic_dout(0) << "RefCountedObject::put " << this << " " << nref.read() << " -> " << (nref.read() - 1) << dendl;
     if (nref.dec() == 0)
       delete this;
   }

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 5d6874c64cc2aaae520f1064118a138d878863e7..f0a2449a6adaa51c2be32ff7ed78e9181cac4715 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -865,7 +865,6 @@ int SimpleMessenger::Pipe::accept()
     out_seq = existing->out_seq;
     in_seq = existing->in_seq;
     in_seq_acked = in_seq;
-    last_close = existing->last_close;
     dout(10) << "accept out_seq " << out_seq << " in_seq " << in_seq << dendl;
     for (map<int, list<Message*> >::iterator p = existing->out_q.begin();
          p != existing->out_q.end();
@@ -1662,14 +1661,7 @@ void SimpleMessenger::Pipe::writer()
       }
       continue;
     }
-    dout(1) << "out_seq:" << out_seq << dendl;
-    if (!policy.lossy && policy.server && out_seq > last_close && !(out_seq % 25)) {
-      dout(0) << "closing sd on out_seq " << out_seq
-              << " for testing, last_close is " << last_close << dendl;
-      last_close = out_seq;
-      close(sd);
-      sd = -1;
-    }
+    
     // wait
     dout(20) << "writer sleeping" << dendl;
     cond.Wait(pipe_lock);

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 1669d14f015f3eb38f4cdae503c3e8d5324e8a07..0b9b46ee76552f5d4e7e7de60df4b8f7aa1072ab 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -152,7 +152,6 @@ private:
     __u32 connect_seq, peer_global_seq;
     uint64_t out_seq;
     uint64_t in_seq, in_seq_acked;
-    uint64_t last_close;
     
     int accept();   // server handshake
     int connect();  // client handshake
@@ -212,15 +211,11 @@ private:
       reader_running(false), reader_joining(false), writer_running(false),
       in_qlen(0), keepalive(false),
       connect_seq(0), peer_global_seq(0),
-      out_seq(0), in_seq(0), in_seq_acked(0), last_close(0),
+      out_seq(0), in_seq(0), in_seq_acked(0),
       reader_thread(this), writer_thread(this) {
       connection_state->pipe = get();
-      generic_dout(1) << "creating pipe " << this << " with connection "
-          << connection_state << dendl;
     }
     ~Pipe() {
-      generic_dout(1) << "deleting pipe " << this << " with connection "
-          << connection_state << dendl;
       for (map<int, xlist<Pipe *>::item* >::iterator i = queue_items.begin();
           i != queue_items.end();
           ++i) {

diff --git a/src/vstart.sh b/src/vstart.sh
index 58ddff74c7d7bd7f2429a03e11f688a3b66ee697..282ce17a2ff7123070e40e67ae582521fc8640ed 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -157,17 +157,17 @@ else
        debug mon = 20
         debug paxos = 20
         debug auth = 20
-        debug ms = 20'
+        debug ms = 1'
     COSDDEBUG='
         lockdep = 1
-        debug ms = 20
+        debug ms = 1
         debug osd = 25
         debug monc = 20
         debug journal = 20
         debug filestore = 10'
     CMDSDEBUG='
         lockdep = 1
-        debug ms = 20
+        debug ms = 1
         debug mds = 20
         debug auth = 20
         debug monc = 20