From ebb4093c2c8ac10ddba92866634d77882975511f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 24 Oct 2017 22:16:26 -0500 Subject: [PATCH] osd/PG: make recovering_oids a multiset For multiple backfill targets, we start MAX multiple times. Signed-off-by: Sage Weil --- src/osd/PG.cc | 3 +-- src/osd/PG.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index bd013440657a4..06c2767455be4 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -2209,7 +2209,6 @@ void PG::start_recovery_op(const hobject_t& soid) assert(recovery_ops_active >= 0); recovery_ops_active++; #ifdef DEBUG_RECOVERY_OIDS - assert(recovering_oids.count(soid) == 0); recovering_oids.insert(soid); #endif osd->start_recovery_op(this, soid); @@ -2226,7 +2225,7 @@ void PG::finish_recovery_op(const hobject_t& soid, bool dequeue) recovery_ops_active--; #ifdef DEBUG_RECOVERY_OIDS assert(recovering_oids.count(soid)); - recovering_oids.erase(soid); + recovering_oids.erase(recovering_oids.find(soid)); #endif osd->finish_recovery_op(this, soid, dequeue); diff --git a/src/osd/PG.h b/src/osd/PG.h index 20d33ec09cab6..2b9571d927600 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -840,7 +840,7 @@ protected: int recovery_ops_active; set waiting_on_backfill; #ifdef DEBUG_RECOVERY_OIDS - set recovering_oids; + multiset recovering_oids; #endif protected: -- 2.39.5