From: Brett Niver <bniver@redhat.com>
Date: Thu, 26 May 2016 17:39:43 +0000 (-0400)
Subject: mds: log on bad seq
X-Git-Tag: v11.0.0~374^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9214%2Fhead;p=ceph.git

mds: log on bad seq

Fixes: http://tracker.ceph.com/issues/9904
Signed-off-by: Brett Niver <bniver@redhat.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 750fb418cef4..debac40d7ac6 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -349,10 +349,16 @@ void Server::handle_client_session(MClientSession *m)
 	m->put();
 	return;
       }
+      // We are getting a seq that is higher than expected.
+      // Handle the same as any other seqn error.
+      //
       if (m->get_seq() != session->get_push_seq()) {
-	dout(0) << "old push seq " << m->get_seq() << " != " << session->get_push_seq() 
+	dout(0) << "old push seq " << m->get_seq() << " != " << session->get_push_seq()
 		<< ", BUGGY!" << dendl;
-	assert(0);
+	mds->clog->warn() << "incorrect push seq " << m->get_seq() << " != "
+			  << session->get_push_seq() << ", dropping" << " from client : " << session->get_human_name();
+	m->put();
+	return;
       }
       journal_close_session(session, Session::STATE_CLOSING, NULL);
     }