From: Sage Weil <sage.weil@dreamhost.com>
Date: Mon, 20 Feb 2012 21:00:14 +0000 (-0800)
Subject: mon: disable pg_num adjustment
X-Git-Tag: v0.43~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=443203705ceead925e9fda6f70467d394dc1f3c8;p=ceph.git

mon: disable pg_num adjustment

Until #1515 is fixed/reimplemented.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 139d5f943b92..51ed5e69eee4 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2032,6 +2032,11 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
 	      paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, paxos->get_version()));
 	      return true;
 	    } else if (m->cmd[4] == "pg_num") {
+	      if (true) {
+		// ** DISABLE THIS FOR NOW **
+		ss << "pg_num adjustment currently disabled (broken implementation)";
+		// ** DISABLE THIS FOR NOW **
+	      } else
 	      if (n <= p->get_pg_num()) {
 		ss << "specified pg_num " << n << " <= current " << p->get_pg_num();
 	      } else if (!mon->pgmon()->pg_map.creating_pgs.empty()) {