From: David Zafman <dzafman@redhat.com>
Date: Fri, 9 Sep 2016 05:29:10 +0000 (-0700)
Subject: osd: Only set head_error when unexpected clone belongs to current head
X-Git-Tag: v11.1.0~486^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4bc08f29a9f24c3afb075565b13524d5a5002bcb;p=ceph.git

osd: Only set head_error when unexpected clone belongs to current head

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 439ea5d1d6f4..6068e8e7a4e6 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -12914,7 +12914,8 @@ void ReplicatedPG::scrub_snapshot_metadata(
       ++scrubber.shallow_errors;
       soid_error.set_headless();
       scrubber.store->add_snap_error(pool.id, soid_error);
-      head_error.set_clone(soid.snap);
+      if (head && soid.get_head() == head->get_head())
+	head_error.set_clone(soid.snap);
       continue;
     }