From: Kefu Chai <kchai@redhat.com>
Date: Thu, 9 May 2019 10:51:31 +0000 (+0800)
Subject: crimson/osd: add crimson_debug_pg_always_active option
X-Git-Tag: v15.1.0~2661^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28079%2Fhead;p=ceph.git

crimson/osd: add crimson_debug_pg_always_active option

before crimson is able to peer, we should leave this option ON.

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 67607ae206d7..73149ec92f09 100644
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -1538,3 +1538,5 @@ 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 64512e4008c5..6734274613ee 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -8240,6 +8240,10 @@ 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 82775219fd71..b4f5f57822dd 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -960,6 +960,9 @@ seastar::future<> PG::share_pg_info()
 seastar::future<> PG::wait_for_active()
 {
   logger().debug("wait_for_active: {}", pg_state_string(info.stats.state));
+  if (local_conf()->crimson_debug_pg_always_active) {
+    return seastar::now();
+  }
   if (test_state(PG_STATE_ACTIVE)) {
     return seastar::now();
   } else {