From d4ba8ef4a645025df8913c2daab20462adf10b90 Mon Sep 17 00:00:00 2001 From: chunmei-liu Date: Tue, 16 Nov 2021 20:40:09 -0800 Subject: [PATCH] crimson: add delay for peering_event start when nested Delay the second (nested) peerevent::start to let the first finish. Then avoid interruptor nesting which will cause local interrupt_cond not equal global interrupt_cond. Signed-off-by: chunmei-liu --- src/crimson/osd/pg.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index 5d757df9a95..193e762821d 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -268,6 +268,7 @@ void PG::on_activate_complete() shard_services, pg_whoami, pgid, + float(0.001), get_osdmap_epoch(), get_osdmap_epoch(), PeeringState::DoRecovery{}); @@ -279,6 +280,7 @@ void PG::on_activate_complete() shard_services, pg_whoami, pgid, + float(0.001), get_osdmap_epoch(), get_osdmap_epoch(), PeeringState::RequestBackfill{}); @@ -290,6 +292,7 @@ void PG::on_activate_complete() shard_services, pg_whoami, pgid, + float(0.001), get_osdmap_epoch(), get_osdmap_epoch(), PeeringState::AllReplicasRecovered{}); -- 2.47.3