diff options
| author | Gregory Farnum <greg@inktank.com> | 2013-09-12 10:38:41 -0700 |
|---|---|---|
| committer | Gregory Farnum <greg@inktank.com> | 2013-09-12 10:38:41 -0700 |
| commit | a41aa9468f4c8dd92604c20e015904ac75f1e746 (patch) | |
| tree | b98462f22cc35a808b61eb50e78c96268cdcd162 | |
| parent | 73e626ccea957a7ecca8ee872c6a6350cdcc7cf2 (diff) | |
| parent | 40613b700b87b495d67793101ae05d6ba58b2a9a (diff) | |
| download | ceph-a41aa9468f4c8dd92604c20e015904ac75f1e746.tar.gz | |
Merge pull request #589 from ceph/wip-6279
mon/MDSMonitor: don't reset incarnation when creating newfs
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 9988d8c8402..b2273274521 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -947,6 +947,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); |