From: Sage Weil <sage@redhat.com>
Date: Tue, 25 Apr 2017 16:14:29 +0000 (-0400)
Subject: osd/PrimaryLogPG: allow creation of obc for new head object
X-Git-Tag: v12.0.3~28^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=751de6ed2ee4771606de27c32de9c2a6772bdad2;p=ceph.git

osd/PrimaryLogPG: allow creation of obc for new head object

We may be creating the head object to migrate the SnapSet to.

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

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index ccbc8ba63e03..df25ddf8b0d9 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -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 "