From: Sage Weil <sage@newdream.net>
Date: Wed, 17 Jun 2009 16:53:39 +0000 (-0700)
Subject: mon: implement 'mds setmap <epoch>' to (re)set mdsmap
X-Git-Tag: v0.9~53
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b59e70a6b172a3d427935335ecfce016600a03a5;p=ceph.git

mon: implement 'mds setmap <epoch>' to (re)set mdsmap
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 86470fbf1e51..a6663d24dc4c 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -470,6 +470,22 @@ bool MDSMonitor::prepare_command(MMonCommand *m)
       r = 0;
       ss << "max_mds = " << pending_mdsmap.max_mds;
     }
+    else if (m->cmd[1] == "setmap" && m->cmd.size() == 3) {
+      MDSMap map;
+      map.decode(m->get_data());
+      epoch_t e = atoi(m->cmd[2].c_str());
+      //if (ceph_fsid_compare(&map.get_fsid(), &mon->monmap->fsid) == 0) {
+      if (pending_mdsmap.epoch == e) {
+	map.epoch = pending_mdsmap.epoch;  // make sure epoch is correct
+	pending_mdsmap = map;
+	string rs = "set mds map";
+	paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs));
+	return true;
+      } else
+	ss << "next mdsmap epoch " << pending_mdsmap.epoch << " != " << e;
+	//} else
+	//ss << "mdsmap fsid " << map.fsid << " does not match monitor fsid " << mon->monmap->fsid;
+    }
   }
   if (r == -EINVAL) 
     ss << "unrecognized command";