From: Sage Weil <sage@redhat.com>
Date: Thu, 31 Aug 2017 21:21:01 +0000 (-0400)
Subject: osd: scrub: no need to expect snapdir objects
X-Git-Tag: v13.0.1~840^2~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c71964096bb4144488178d4ec8152a3b638dd77;p=ceph.git

osd: scrub: no need to expect snapdir objects

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 09592e3ede83..e9bbba46cd23 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3834,7 +3834,8 @@ void PG::_scan_snaps(ScrubMap &smap)
     const hobject_t &hoid = i->first;
     ScrubMap::object &o = i->second;
 
-    if (hoid.is_head() || hoid.is_snapdir()) {
+    assert(!hoid.is_snapdir());
+    if (hoid.is_head()) {
       // parse the SnapSet
       bufferlist bl;
       if (o.attrs.find(SS_ATTR) == o.attrs.end()) {
diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 468e29297d0d..eb1e0055f39d 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -820,7 +820,8 @@ map<pg_shard_t, ScrubMap *>::const_iterator
     }
 
     // We won't pick an auth copy if the snapset is missing or won't decode.
-    if (obj.is_head() || obj.is_snapdir()) {
+    assert(!obj.is_snapdir());
+    if (obj.is_head()) {
       k = i->second.attrs.find(SS_ATTR);
       if (k == i->second.attrs.end()) {
 	shard_info.set_ss_attr_missing();