ReplicatedPG: start scanning omap at omap_recovered_to

Previously, we started scanning omap after omap_recovered_to.
This is a problem since the break in the loop implies that
omap_recovered_to is the first key not recovered.

Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 09c71f2f5ee9929ac4574f4c35fb8c0211aad097)

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index f588dfa8fe9d4f0db2b6908465e6acb49b484c7a..2e503d06862224f2ae363b3534ebe3d75837096a 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5556,7 +5556,7 @@ int ReplicatedPG::send_push(int prio, int peer,
     ObjectMap::ObjectMapIterator iter =
       osd->store->get_omap_iterator(coll,
                                    recovery_info.soid);
-    for (iter->upper_bound(progress.omap_recovered_to);
+    for (iter->lower_bound(progress.omap_recovered_to);
         iter->valid();
         iter->next()) {
       if (available < (iter->key().size() + iter->value().length()))