From: Samuel Just <sjust@redhat.com>
Date: Wed, 14 Jan 2015 17:47:52 +0000 (-0800)
Subject: ReplicatedPG::_scrub: don't record digests for snapdirs
X-Git-Tag: v0.93~211^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=204fa0f09e13bd573819de3aca32076e3d8e14ed;p=ceph.git

ReplicatedPG::_scrub: don't record digests for snapdirs

They are always empty, and the finish_ctx machinery doesn't really
work for snapdirs anyway.

Fixes: #10536
Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 0a54565d5bab..e809fc85b606 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -12803,6 +12803,8 @@ void ReplicatedPG::_scrub(ScrubMap& scrubmap)
 	   scrubber.missing_digest.begin();
 	 p != scrubber.missing_digest.end();
 	 ++p) {
+      if (p->first.is_snapdir())
+	continue;
       dout(10) << __func__ << " recording digests for " << p->first << dendl;
       ObjectContextRef obc = get_object_context(p->first, false);
       assert(obc);