From adc660fdaf0c97c74f90ff6acd031d40e18a4131 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 19 Aug 2008 16:06:18 -0700
Subject: [PATCH] mds: inc session seq on cap import

---
 src/mds/MDCache.cc | 2 +-
 src/mds/Server.cc  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index d88b194c462c0..5ad23c6f59677 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -3619,7 +3619,7 @@ void MDCache::do_cap_import(Session *session, CInode *in, Capability *cap)
 						cap->wanted(),
 						cap->get_mseq());
     realm->build_snap_trace(reap->snapbl);
-    mds->messenger->send_message(reap, session->inst);
+    mds->send_message_client(reap, session->inst);
   } else {
     dout(10) << "do_cap_import missing past snap parents, delaying " << session->inst.name << " mseq "
 	     << cap->get_mseq() << " on " << *in << dendl;
diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index c0e11f2ec9342..76ddd3c7b901b 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -187,7 +187,11 @@ void Server::handle_client_session(MClientSession *m)
 	       << ", dropping" << dendl;
       return;
     }
-    assert(m->seq == session->get_push_seq());
+    if (m->seq != session->get_push_seq()) {
+      dout(10) << "old push seq " << m->seq << " != " << session->get_push_seq() 
+	       << ", BUGGY!" << dendl;
+      assert(0);
+    }
     mds->sessionmap.set_state(session, Session::STATE_CLOSING);
     pv = ++mds->sessionmap.projected;
     mdlog->submit_entry(new ESession(m->get_source_inst(), false, pv),
-- 
2.39.5