diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2013-09-12 09:50:51 +0800 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-10-14 09:40:30 -0700 |
| commit | bd073eeac28d8cba969e5746c5e6adcb95820fdf (patch) | |
| tree | 84d89c88ec7535bf4c2b3e04a842437ab162f4ff | |
| parent | 3a3724b782c53c92c45624ad02df9f0de77f1545 (diff) | |
| download | ceph-bd073eeac28d8cba969e5746c5e6adcb95820fdf.tar.gz | |
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>
| -rw-r--r-- | src/mon/MDSMonitor.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index d89cc412912..1c34a766e5f 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); |