RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-11 04:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/osd: add crimson_debug_pg_always_active option

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

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-05-09 18:51:31 +08:00
parent ee796ade48
commit 9813f7d623
3 changed files with 9 additions and 0 deletions

2
src/common/legacy_config_opts.h
View File

@ -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_id, OPT_STR) // Client Id
OPTION(rgw_sts_client_secret, OPT_STR) // Client Secret OPTION(rgw_sts_client_secret, OPT_STR) // Client Secret
OPTION(debug_allow_any_pool_priority, OPT_BOOL) OPTION(debug_allow_any_pool_priority, OPT_BOOL)
OPTION(crimson_debug_pg_always_active, OPT_BOOL)

4
src/common/options.cc
View File

@ -8240,6 +8240,10 @@ std::vector<Option> get_mds_client_options() {
Option("debug_allow_any_pool_priority", Option::TYPE_BOOL, Option::LEVEL_DEV) Option("debug_allow_any_pool_priority", Option::TYPE_BOOL, Option::LEVEL_DEV)
.set_default(false) .set_default(false)
.set_description("Allow any pool priority to be set to test conversion to new range"), .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"),
}); });
} }

3
src/crimson/osd/pg.cc
View File

@ -960,6 +960,9 @@ seastar::future<> PG::share_pg_info()
seastar::future<> PG::wait_for_active() seastar::future<> PG::wait_for_active()
{ {
logger().debug("wait_for_active: {}", pg_state_string(info.stats.state)); 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)) { if (test_state(PG_STATE_ACTIVE)) {
return seastar::now(); return seastar::now();
} else { } else {