From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Thu, 12 Sep 2013 01:50:51 +0000 (+0800)
Subject: mon/MDSMonitor: don't reset incarnation when creating newfs
X-Git-Tag: v0.67.5~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd073eeac28d8cba969e5746c5e6adcb95820fdf;p=ceph.git

mon/MDSMonitor: don't reset incarnation when creating newfs

Fixes: #6279

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
(cherry picked from commit 40613b700b87b495d67793101ae05d6ba58b2a9a)
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index d89cc4129125..1c34a766e5ff 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -951,6 +951,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
       ss << "this is DANGEROUS and will wipe out the mdsmap's fs, and may clobber data in the new pools you specify.  add --yes-i-really-mean-it if you do.";
       r = -EPERM;
     } else {
+      newmap.inc = pending_mdsmap.inc;
       pending_mdsmap = newmap;
       pending_mdsmap.epoch = mdsmap.epoch + 1;
       create_new_fs(pending_mdsmap, metadata, data);