crimson/osd: revert 9813f7d6

since we have a proper PeeringState implementation, there is no need to
fake an active+clean PG anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index 5156abd00c2ce023c826c24548ecf2af4294d13f..b5a02d915e2d13d989b1501b1f68c85a110a349c 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -1548,5 +1548,3 @@ OPTION(rgw_sts_token_introspection_url, OPT_STR)  // url for introspecting web t
 OPTION(rgw_sts_client_id, OPT_STR) // Client Id
 OPTION(rgw_sts_client_secret, OPT_STR) // Client Secret
 OPTION(debug_allow_any_pool_priority, OPT_BOOL)
-
-OPTION(crimson_debug_pg_always_active, OPT_BOOL)

diff --git a/src/common/options.cc b/src/common/options.cc
index 82c71b3a1f91e97cb49d55238a508b37f44d0757..c7be9214da6d65b1bf5341526867ea55f7411aec 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -8338,10 +8338,6 @@ std::vector<Option> get_mds_client_options() {
     Option("debug_allow_any_pool_priority", Option::TYPE_BOOL, Option::LEVEL_DEV)
     .set_default(false)
     .set_description("Allow any pool priority to be set to test conversion to new range"),
-
-    Option("crimson_debug_pg_always_active", Option::TYPE_BOOL, Option::LEVEL_DEV)
-    .set_default(true)
-    .set_description("remove me once crimson peering works"),
   });
 }
 

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index d4c25aedcc290dc3370c956e2b21ab8e7ddf176c..7eff0cd51274bfbc430f0268819ce0a9db61f8d7 100644 (file)
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -303,10 +303,6 @@ std::ostream& operator<<(std::ostream& os, const PG& pg)
 seastar::future<> PG::wait_for_active()
 {
   logger().debug("wait_for_active: {}", peering_state.get_pg_state_string());
-  if (local_conf()->crimson_debug_pg_always_active) {
-    return seastar::now();
-  }
-
   if (peering_state.is_active()) {
     return seastar::now();
   } else {