]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedBackend::prepare_pull: set recover_info.size for clones 6153/head
authorSamuel Just <sjust@redhat.com>
Fri, 28 Aug 2015 19:46:57 +0000 (12:46 -0700)
committerLoic Dachary <ldachary@redhat.com>
Tue, 10 Nov 2015 12:46:28 +0000 (13:46 +0100)
Fixes: #12828
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 1d3e46bedb9a8c0d2200e39f62f4e2c3337619f3)

src/osd/ReplicatedBackend.cc

index b86d4d1e7444f1661af0604e0f2804eb02160b0f..f082f8c855b4a49b27e60094745c8e79d9e543c0 100644 (file)
@@ -1500,6 +1500,9 @@ void ReplicatedBackend::prepare_pull(
                       recovery_info.clone_subset);
     // FIXME: this may overestimate if we are pulling multiple clones in parallel...
     dout(10) << " pulling " << recovery_info << dendl;
+
+    assert(ssc->snapset.clone_size.count(soid.snap));
+    recovery_info.size = ssc->snapset.clone_size[soid.snap];
   } else {
     // pulling head or unversioned object.
     // always pull the whole thing.