From: Sage Weil <sage@redhat.com>
Date: Sun, 9 Dec 2018 14:37:02 +0000 (-0600)
Subject: mon: mon_osd_pool_ec_fast_read -> osd_pool_default_ec_fast_read
X-Git-Tag: v14.1.0~594^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=31dd620883bc5114a476f9f37251f139b8abe326;p=ceph-ci.git

mon: mon_osd_pool_ec_fast_read -> osd_pool_default_ec_fast_read

More consistent name!

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

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index b9c6150e19f..415ff783eea 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -240,6 +240,12 @@
   this behavior should instead make use of the ``ceph auth export
   <entity-name>`` command for whichever key(s) they need.
 
+* The ``mon_osd_pool_ec_fast_read`` option has been renamed
+  ``osd_pool_default_ec_fast_read`` to be more consistent with other
+  ``osd_pool_default_*`` options that affect default values for newly
+  created RADOS pools.
+
+
 Upgrading from Luminous
 -----------------------
 
diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 89bbad0e9c8..3f3574bc689 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -229,7 +229,6 @@ OPTION(mon_osd_max_split_count, OPT_INT) // largest number of PGs per "involved"
 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
-OPTION(mon_osd_pool_ec_fast_read, OPT_BOOL) // whether turn on fast read on the pool or not
 OPTION(mon_election_timeout, OPT_FLOAT)  // on election proposer, max waiting time for all ACKs
 OPTION(mon_lease, OPT_FLOAT)       // lease interval
 OPTION(mon_lease_renew_interval_factor, OPT_FLOAT) // on leader, to renew the lease
@@ -585,6 +584,7 @@ OPTION(osd_erasure_code_plugins, OPT_STR) // list of erasure code plugins
 // Allows the "peered" state for recovery and backfill below min_size
 OPTION(osd_allow_recovery_below_min_size, OPT_BOOL)
 
+OPTION(osd_pool_default_ec_fast_read, OPT_BOOL) // whether turn on fast read on the pool or not
 OPTION(osd_pool_default_flags, OPT_INT)   // default flags for new pools
 OPTION(osd_pool_default_flag_hashpspool, OPT_BOOL)   // use new pg hashing to prevent pool/pg overlap
 OPTION(osd_pool_default_flag_nodelete, OPT_BOOL) // pool can't be deleted
diff --git a/src/common/options.cc b/src/common/options.cc
index 223470ffa2f..27e7d277053 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1398,10 +1398,6 @@ std::vector<Option> get_global_options() {
     .set_default(.25)
     .set_description("Calculate all PG mappings if estimated fraction of PGs that change is above this amount"),
 
-    Option("mon_osd_pool_ec_fast_read", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
-    .set_default(false)
-    .set_description(""),
-
     Option("mon_stat_smooth_intervals", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(6)
     .set_min(1)
@@ -2193,6 +2189,10 @@ std::vector<Option> get_global_options() {
     .set_default(-1)
     .set_description(""),
 
+    Option("osd_pool_default_ec_fast_read", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+    .set_default(false)
+    .set_description(""),
+
     Option("osd_pool_default_crush_rule", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(-1)
     .set_description(""),
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c635ffe8838..35b5c8d0200 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -6731,7 +6731,7 @@ int OSDMonitor::prepare_new_pool(string& name,
         fread = true;
         break;
       case FAST_READ_DEFAULT:
-        fread = g_conf()->mon_osd_pool_ec_fast_read;
+        fread = g_conf()->osd_pool_default_ec_fast_read;
         break;
       default:
         *ss << "invalid fast_read setting: " << fast_read;