]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: start scanning omap at omap_recovered_to
authorSamuel Just <sam.just@inktank.com>
Wed, 23 Jan 2013 20:15:10 +0000 (12:15 -0800)
committerSamuel Just <sam.just@inktank.com>
Wed, 23 Jan 2013 20:15:10 +0000 (12:15 -0800)
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>
src/osd/ReplicatedPG.cc

index 6b354f9584a085b8311d95e55627b4deb158cc1f..2cc01a6d4114c3d41c9951008217b36f3a211838 100644 (file)
@@ -5558,7 +5558,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()))