From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Oct 2017 03:16:26 +0000 (-0500)
Subject: osd/PG: make recovering_oids a multiset
X-Git-Tag: v13.0.1~401^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ebb4093c2c8ac10ddba92866634d77882975511f;p=ceph.git

osd/PG: make recovering_oids a multiset

For multiple backfill targets, we start MAX multiple times.

Signed-off-by: Sage Weil <sage@redhat.com>
---

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<pg_shard_t> waiting_on_backfill;
 #ifdef DEBUG_RECOVERY_OIDS
-  set<hobject_t> recovering_oids;
+  multiset<hobject_t> recovering_oids;
 #endif
 
 protected: