]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Only set head_error when unexpected clone belongs to current head
authorDavid Zafman <dzafman@redhat.com>
Fri, 9 Sep 2016 05:29:10 +0000 (22:29 -0700)
committerDavid Zafman <dzafman@redhat.com>
Mon, 10 Oct 2016 18:22:54 +0000 (11:22 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
src/osd/ReplicatedPG.cc

index 439ea5d1d6f43a1c677e4e4e0d7a50401f9c5307..6068e8e7a4e66b38cffbe36dd99ce8895dc0abc5 100644 (file)
@@ -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;
     }