From: Yan, Zheng <zyan@redhat.com>
Date: Thu, 28 Mar 2019 10:03:31 +0000 (+0800)
Subject: mds: update projected_version when upgrading snaptable
X-Git-Tag: v13.2.7~60^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=092e138bf7577b643eac843a1c7cb75ff87b5666;p=ceph.git

mds: update projected_version when upgrading snaptable

Fixes: http://tracker.ceph.com/issues/38835
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit edf3bcbfa984ea817a9ac5411af23e5a7c29d3d8)

Conflicts:
	src/mds/SnapServer.h
- ceph_assert()
---

diff --git a/src/mds/SnapServer.h b/src/mds/SnapServer.h
index 7b9c4af9e47fd..4a27dcc84d3cd 100644
--- a/src/mds/SnapServer.h
+++ b/src/mds/SnapServer.h
@@ -100,11 +100,12 @@ public:
 
   bool upgrade_format() {
     // upgraded from old filesystem
+    assert(is_active());
     assert(last_snap > 0);
     bool upgraded = false;
     if (get_version() == 0) {
       // version 0 confuses snapclient code
-      reset_state();
+      reset();
       upgraded = true;
     }
     if (snaprealm_v2_since == CEPH_NOSNAP) {