mds: make sure snaptable version > 0

version 0 snaptable confuses snapshot cache code

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index e32db61df1204e783759b1b9b25bf5d79484d0e5..e8d2e8c8557bfe7396bc49c278d9f8573c597a61 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -1322,6 +1322,13 @@ void MDSRank::replay_done()
   mdlog->get_journaler()->set_writeable();
   mdlog->get_journaler()->trim_tail();
 
+  if (snapserver->get_version() == 0) {
+    // upgraded from old filesystem. version 0 snaptable confuses current code.
+    dout(1) << "upgrading snaptable version from 0 to 1" << dendl;
+    snapserver->reset();
+    sessionmap.save(new C_MDSInternalNoop);
+  }
+
   if (g_conf->mds_wipe_sessions) {
     dout(1) << "wiping out client sessions" << dendl;
     sessionmap.wipe();