From: Samuel Just <sam.just@inktank.com>
Date: Fri, 19 Apr 2013 20:21:01 +0000 (-0700)
Subject: OSDMonitor: pg split is no longer experimental
X-Git-Tag: v0.61~137
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad845e61b9c0e19915de527e09ec1f8747b92df8;p=ceph.git

OSDMonitor: pg split is no longer experimental

Fixes: #4711
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 8868189446de..348d3130e1c4 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3396,12 +3396,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
 	      wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
 	      return true;
 	    } else if (m->cmd[4] == "pg_num") {
-	      if (m->cmd.size() < 7 ||
-		  m->cmd[6] != "--allow-experimental-feature") {
-		ss << "increasing pg_num is currently experimental, add "
-		   << "--allow-experimental-feature as the last argument "
-		   << "to force";
-	      } else if (n <= p->get_pg_num()) {
+	      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()) {
 		ss << "currently creating pgs, wait";