From: Samuel Just <sam.just@inktank.com>
Date: Thu, 5 Jul 2012 20:41:37 +0000 (-0700)
Subject: OSDMonitor: disable cluster snapshot
X-Git-Tag: v0.50~109^2~2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=691741985afdeebb2aa7b518565b32adebedbc83;p=ceph.git

OSDMonitor: disable cluster snapshot

The map handling changes broke cluster snapshot support.

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f87753ad7741..8db834890d48 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2008,11 +2008,9 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
       return prepare_unset_flag(m, CEPH_OSDMAP_NOIN);
     }
     else if (m->cmd[1] == "cluster_snap" && m->cmd.size() == 3) {
-      pending_inc.cluster_snapshot = m->cmd[2];
-      ss << "creating cluster snap " << m->cmd[2];
-      getline(ss, rs);
-      paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, paxos->get_version()));
-      return true;
+      // ** DISABLE THIS FOR NOW **
+      ss << "cluster snapshot currently disabled (broken implementation)";
+      // ** DISABLE THIS FOR NOW **
     }
     else if (m->cmd[1] == "down" && m->cmd.size() >= 3) {
       bool any = false;