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 139d5f943b922a80614d94db9e022acc7d4d4968..51ed5e69eee41a517abe60e0d6dc5c3d74413d8c 100644 (file)
--- 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()) {