From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 17 Apr 2018 01:42:53 +0000 (-0700)
Subject: MDSMonitor: initialize new Filesystem epoch from pending
X-Git-Tag: v12.2.6~155^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21512%2Fhead;p=ceph.git

MDSMonitor: initialize new Filesystem epoch from pending

Fixes: https://tracker.ceph.com/issues/23764

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 9341e4ba01e1641fa7a016698cdf53a28c7af0c7)

Conflicts:
	src/mds/FSMap.cc: Resolved in create_filesystem
---

diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc
index d2ba81aeb09..504aa41f9b2 100644
--- a/src/mds/FSMap.cc
+++ b/src/mds/FSMap.cc
@@ -230,6 +230,7 @@ void FSMap::create_filesystem(boost::string_view name,
                               uint64_t features)
 {
   auto fs = std::make_shared<Filesystem>();
+  fs->mds_map.epoch = epoch;
   fs->mds_map.fs_name = std::string(name);
   fs->mds_map.max_mds = 1;
   fs->mds_map.data_pools.push_back(data_pool);