From: Kefu Chai <kchai@redhat.com>
Date: Sat, 29 Jun 2019 12:25:16 +0000 (+0800)
Subject: crimson/osd: revert 9813f7d6
X-Git-Tag: v15.1.0~2342^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc4d8082d032fe21ca0690c47d7e7ab3de83d478;p=ceph.git

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 5156abd00c2c..b5a02d915e2d 100644
--- 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 82c71b3a1f91..c7be9214da6d 100644
--- 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 d4c25aedcc29..7eff0cd51274 100644
--- 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 {