]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/PrimaryLogPG: allow creation of obc for new head object
authorSage Weil <sage@redhat.com>
Tue, 25 Apr 2017 16:14:29 +0000 (12:14 -0400)
committerSage Weil <sage@redhat.com>
Fri, 5 May 2017 17:39:14 +0000 (13:39 -0400)
We may be creating the head object to migrate the SnapSet to.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PrimaryLogPG.cc

index ccbc8ba63e037a0c9b1160ce66bbab09bbdce11c..df25ddf8b0d9d36eb07c2002f72a7655d8923054 100644 (file)
@@ -13488,13 +13488,14 @@ void PrimaryLogPG::scrub_snapshot_metadata(
       // this happens if we encounter other errors above, like a missing
       // or extra clone.
       dout(10) << __func__ << " not writing snapset to " << p.first
-              << " " << p.second << "; didn't convert fully" << dendl;
+              << " snapset " << p.second << " clones " << p.second.clones
+              << "; didn't convert fully" << dendl;
       scrub_cstat.sum.num_legacy_snapsets++;
       continue;
     }
     dout(10) << __func__ << " writing snapset to " << p.first
             << " " << p.second << dendl;
-    ObjectContextRef obc = get_object_context(p.first, false);
+    ObjectContextRef obc = get_object_context(p.first, true);
     if (!obc) {
       osd->clog->error() << info.pgid << " " << mode
                         << " cannot get object context for "