Merge branch 'xxg-wip-client_dupmdsmap' of git://github.com/xiexinggu…

…o/ceph into greg-fs-testing #9774
ceph · Jun 27, 2016 · 07f8f39 · 07f8f39
2 parents 1a5c9c8 + d4a4827
commit 07f8f39
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/client/Client.cc b/src/client/Client.cc
@@ -2506,9 +2506,10 @@ void Client::handle_fs_map_user(MFSMapUser *m)
 
 void Client::handle_mds_map(MMDSMap* m)
 {
-  if (m->get_epoch() < mdsmap->get_epoch()) {
-    ldout(cct, 1) << "handle_mds_map epoch " << m->get_epoch() << " is older than our "
-	    << mdsmap->get_epoch() << dendl;
+  if (m->get_epoch() <= mdsmap->get_epoch()) {
+    ldout(cct, 1) << "handle_mds_map epoch " << m->get_epoch()
+                  << " is identical to or older than our "
+                  << mdsmap->get_epoch() << dendl;
     m->put();
     return;
   }