]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msgr: warn+fault on bad seq. but keep assert, for now.
authorSage Weil <sage@newdream.net>
Tue, 29 Jul 2008 13:57:10 +0000 (06:57 -0700)
committerSage Weil <sage@newdream.net>
Tue, 29 Jul 2008 13:57:10 +0000 (06:57 -0700)
src/msg/SimpleMessenger.cc

index 69239e52950d6c0f413c7f2da39cc6235e253407..db1d8cfadfa260bb7bf4b1901c2567d6cdf117c2 100644 (file)
@@ -1422,7 +1422,17 @@ void Rank::Pipe::reader()
        continue;
       }
       in_seq++;
-      assert(in_seq == m->get_seq());
+
+      if (in_seq != m->get_seq()) {
+       dout(0) << "reader got bad seq " << m->get_seq() << " expected " << in_seq
+               << " for " << *m << " from " << m->get_source() << dendl;
+       derr(0) << "reader got bad seq " << m->get_seq() << " expected " << in_seq
+               << " for " << *m << " from " << m->get_source() << dendl;
+       assert(in_seq == m->get_seq()); // for now!
+       fault();
+       delete m;
+       continue;
+      }
 
       if (in_seq == 1) 
        policy = rank.policy_map[m->get_source().type()];  /* apply policy */