common: kill dead options

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 6a38549b33bd4850c23e953efb3784e27fa260a0..023afeb9219d93ff0c9970eb76e5cc8e528dbbf6 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -679,8 +679,6 @@ OPTION(osd_recovery_sleep_hdd, OPT_FLOAT)
 OPTION(osd_recovery_sleep_ssd, OPT_FLOAT)
 OPTION(osd_snap_trim_sleep, OPT_DOUBLE)
 OPTION(osd_scrub_invalid_stats, OPT_BOOL)
-OPTION(osd_remove_thread_timeout, OPT_INT)
-OPTION(osd_remove_thread_suicide_timeout, OPT_INT)
 OPTION(osd_command_thread_timeout, OPT_INT)
 OPTION(osd_command_thread_suicide_timeout, OPT_INT)
 OPTION(osd_heartbeat_interval, OPT_INT)       // (seconds) how often we ping peers

diff --git a/src/common/options.cc b/src/common/options.cc
index 79e88c5f5fae2d85f9eeb99fd7a3388efb99ec39..50f5cf66a2d5c9a6b521a927a147ffea202ae3b5 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2912,14 +2912,6 @@ std::vector<Option> get_global_options() {
     .set_default(true)
     .set_description(""),
 
-    Option("osd_remove_thread_timeout", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(1_hr)
-    .set_description(""),
-
-    Option("osd_remove_thread_suicide_timeout", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-    .set_default(10_hr)
-    .set_description(""),
-
     Option("osd_command_thread_timeout", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(10_min)
     .set_description(""),