From: John Spray <john.spray@redhat.com>
Date: Fri, 18 Jul 2014 15:02:57 +0000 (+0100)
Subject: mon: carry last_failure_osd_epoch across `fs new`
X-Git-Tag: v0.84~91^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb5a574f1292299788363f3f7c7d229e2247f1d7;p=ceph.git

mon: carry last_failure_osd_epoch across `fs new`

So that new MDSs in a new filesystem are guaranteed
to be up to date with anything we blacklisted
from a filesystem coming before.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index d0c9c7e71331..eed77913f41f 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -1055,6 +1055,7 @@ bool MDSMonitor::management_command(
     newmap.inc = pending_mdsmap.inc;
     pending_mdsmap = newmap;
     pending_mdsmap.epoch = mdsmap.epoch + 1;
+    pending_mdsmap.last_failure_osd_epoch = mdsmap.last_failure_osd_epoch;
     create_new_fs(pending_mdsmap, fs_name, metadata, data);
     ss << "new fs with metadata pool " << metadata << " and data pool " << data;
     r = 0;