mon/OSDMonitor: remove max_split_count configurable

This isn't really relevant or useful now that the mgr is throttling the
actual pg_num adjustment based on pg_num_target, % misplaced, etc.

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

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index e9ef25a2469bc2623bcd1f730d78f76886a3a559..09bf42cd34822211b674db7f808edfa9c695d493 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -2026,9 +2026,6 @@ function test_mon_osd_pool_set()
   ceph osd pool set $TEST_POOL_GETSET pg_num $new_pgs
   ceph osd pool set $TEST_POOL_GETSET pgp_num $new_pgs
   wait_for_clean
-  old_pgs=$(ceph osd pool get $TEST_POOL_GETSET pg_num | sed -e 's/pg_num: //')
-  new_pgs=$(($old_pgs + $(ceph osd stat --format json | jq '.num_osds') * 32 + 1))
-  expect_false ceph osd pool set $TEST_POOL_GETSET pg_num $new_pgs
 
   ceph osd pool set $TEST_POOL_GETSET nosizechange 1
   expect_false ceph osd pool set $TEST_POOL_GETSET size 2

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 270f1ec50f5e4eff638ebfa57cf93a0ba8e7f0bd..a8c6c8e43d0f93b344133ab4b2f8708893f49d34 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -225,7 +225,6 @@ OPTION(mon_osd_min_up_ratio, OPT_DOUBLE)    // min osds required to be up to mar
 OPTION(mon_osd_min_in_ratio, OPT_DOUBLE)   // min osds required to be in to mark things out
 OPTION(mon_osd_warn_op_age, OPT_DOUBLE)     // max op age before we generate a warning (make it a power of 2)
 OPTION(mon_osd_err_op_age_ratio, OPT_DOUBLE)  // when to generate an error, as multiple of mon_osd_warn_op_age
-OPTION(mon_osd_max_split_count, OPT_INT) // largest number of PGs per "involved" OSD to let split create
 OPTION(mon_osd_prime_pg_temp, OPT_BOOL)  // prime osdmap with pg mapping changes
 OPTION(mon_osd_prime_pg_temp_max_time, OPT_FLOAT)  // max time to spend priming
 OPTION(mon_osd_prime_pg_temp_max_estimate, OPT_FLOAT) // max estimate of pg total before we do all pgs in parallel

diff --git a/src/common/options.cc b/src/common/options.cc
index a2732ff3e4c172af3559e179b5b0c719d8e375a1..b79ef90619915904a11446bbab1e4f068dd649f9 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1434,11 +1434,6 @@ std::vector<Option> get_global_options() {
     .add_service("mgr")
     .set_description("issue REQUEST_STUCK health error if OSD ops are slower than is age (seconds)"),
 
-    Option("mon_osd_max_split_count", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(32)
-    .add_service("mon")
-    .set_description(""),
-
     Option("mon_osd_prime_pg_temp", Option::TYPE_BOOL, Option::LEVEL_DEV)
     .set_default(true)
     .add_service("mon")

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f73c48599d39f8c5c720563e7fef6ec169a26f92..2412f298b1d55433c9bd5cd97fa43c40a76af061 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7050,15 +7050,6 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap,
        ss << "splits in cache pools must be followed by scrubs and leave sufficient free space to avoid overfilling.  use --yes-i-really-mean-it to force.";
        return -EPERM;
       }
-      int expected_osds = std::min(p.get_pg_num(), osdmap.get_num_osds());
-      int64_t new_pgs = n - p.get_pg_num_target();
-      if (new_pgs > g_conf()->mon_osd_max_split_count * expected_osds) {
-       ss << "specified pg_num " << n << " is too large (creating "
-          << new_pgs << " new PGs on ~" << expected_osds
-          << " OSDs exceeds per-OSD max with mon_osd_max_split_count of "
-          << g_conf()->mon_osd_max_split_count << ')';
-       return -E2BIG;
-      }
     } else {
       if (osdmap.require_osd_release < CEPH_RELEASE_NAUTILUS) {
        ss << "nautilus OSDs are required to adjust pg_num_pending";