osd/PG: kill dead functions and related 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 023afeb9219d93ff0c9970eb76e5cc8e528dbbf6..7a50dee237fc97e96df098c067f5c37d3a05c6ec 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -718,7 +718,6 @@ OPTION(osd_copyfrom_max_chunk, OPT_U64)   // max size of a COPYFROM chunk
 OPTION(osd_push_per_object_cost, OPT_U64)  // push cost per object
 OPTION(osd_max_push_cost, OPT_U64)  // max size of push message
 OPTION(osd_max_push_objects, OPT_U64)  // max objects in single push op
-OPTION(osd_recovery_forget_lost_objects, OPT_BOOL)   // off for now
 OPTION(osd_max_scrubs, OPT_INT)
 OPTION(osd_scrub_during_recovery, OPT_BOOL) // Allow new scrubs to start while recovery is active on the OSD
 OPTION(osd_scrub_begin_hour, OPT_INT)

diff --git a/src/common/options.cc b/src/common/options.cc
index 50f5cf66a2d5c9a6b521a927a147ffea202ae3b5..e16e597a99e671a3dfc2ee4066bfd86d90104634 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -3033,10 +3033,6 @@ std::vector<Option> get_global_options() {
     .set_default(10)
     .set_description(""),
 
-    Option("osd_recovery_forget_lost_objects", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
-    .set_default(false)
-    .set_description(""),
-
     Option("osd_max_scrubs", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(1)
     .set_description("Maximum concurrent scrubs on a single OSD"),

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 39a40b13a53e33de7a674f01dbd6e742e5f0d029..6d6291d6847a317425a6d4d428e2d574a7b6e5a9 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1422,13 +1422,8 @@ protected:
     pg_shard_t fromosd,
     RecoveryCtx*);
 
-  void check_for_lost_objects();
-  void forget_lost_objects();
-
   void discover_all_missing(std::map<int, map<spg_t,pg_query_t> > &query_map);
   
-  void trim_write_ahead();
-
   map<pg_shard_t, pg_info_t>::const_iterator find_best_info(
     const map<pg_shard_t, pg_info_t> &infos,
     bool restrict_to_up_acting,