From e6acf2d1d528a2395947d446a57bec04a3a002dc Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Thu, 11 Jan 2018 13:37:40 -0600
Subject: [PATCH] osdmaptool: eliminiate global osd_pg[p]_bits option

osdmaptool is the only user.

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/common/legacy_config_opts.h | 2 --
 src/common/options.cc           | 8 --------
 src/tools/osdmaptool.cc         | 6 ++++--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 0cc9e7546f6..dd33b448658 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -568,8 +568,6 @@ OPTION(osd_max_write_size, OPT_INT)
 OPTION(osd_max_pgls, OPT_U64) // max number of pgls entries to return
 OPTION(osd_client_message_size_cap, OPT_U64) // client data allowed in-memory (in bytes)
 OPTION(osd_client_message_cap, OPT_U64)              // num client messages allowed in-memory
-OPTION(osd_pg_bits, OPT_INT)  // bits per osd
-OPTION(osd_pgp_bits, OPT_INT)  // bits per osd
 OPTION(osd_crush_update_weight_set, OPT_BOOL) // update weight set while updating weights
 OPTION(osd_crush_chooseleaf_type, OPT_INT) // 1 = host
 OPTION(osd_pool_use_gmt_hitset, OPT_BOOL) // try to use gmt for hitset archive names if all osds in cluster support it.
diff --git a/src/common/options.cc b/src/common/options.cc
index 00cad6fa0a9..5a9ddb81548 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1888,14 +1888,6 @@ std::vector<Option> get_global_options() {
     .set_default(100)
     .set_description(""),
 
-    Option("osd_pg_bits", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(6)
-    .set_description(""),
-
-    Option("osd_pgp_bits", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(6)
-    .set_description(""),
-
     Option("osd_crush_update_weight_set", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(true)
     .set_description(""),
diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc
index 2eb0b96f3c9..5a7c33441e9 100644
--- a/src/tools/osdmaptool.cc
+++ b/src/tools/osdmaptool.cc
@@ -105,8 +105,8 @@ int main(int argc, const char **argv)
   bool createpool = false;
   bool create_from_conf = false;
   int num_osd = 0;
-  int pg_bits = g_conf->osd_pg_bits;
-  int pgp_bits = g_conf->osd_pgp_bits;
+  int pg_bits = 6;
+  int pgp_bits = 6;
   bool clobber = false;
   bool modified = false;
   std::string export_crush, import_crush, test_map_pg, test_map_object;
@@ -150,6 +150,8 @@ int main(int argc, const char **argv)
       if (!val.empty() && val != "plain") {
 	tree_formatter.reset(Formatter::create(val, "", "json"));
       }
+    } else if (ceph_argparse_witharg(args, i, &pg_bits, err, "--osd-pg-bits", (char*)NULL)) {
+    } else if (ceph_argparse_witharg(args, i, &pgp_bits, err, "--osd-pgp-bits", (char*)NULL)) {
     } else if (ceph_argparse_witharg(args, i, &upmap_file, "--upmap-cleanup", (char*)NULL)) {
       upmap_cleanup = true;
     } else if (ceph_argparse_witharg(args, i, &upmap_file, "--upmap-save", (char*)NULL)) {
-- 
2.39.5