From 092e138bf7577b643eac843a1c7cb75ff87b5666 Mon Sep 17 00:00:00 2001
From: "Yan, Zheng" <zyan@redhat.com>
Date: Thu, 28 Mar 2019 18:03:31 +0800
Subject: [PATCH] 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()
---
 src/mds/SnapServer.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mds/SnapServer.h b/src/mds/SnapServer.h
index 7b9c4af9e47..4a27dcc84d3 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) {
-- 
2.47.3