ReplicatedPG::_scrub: don't bail early for snapdir

Fixes: #7937
Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/common/hobject.h b/src/common/hobject.h
index 293348356bbc24ea4f43cc984d0a820f3c667028..fc12c9f1c457cba54c8e5c8ddf0824db4d3227ef 100644 (file)
--- a/src/common/hobject.h
+++ b/src/common/hobject.h
@@ -102,6 +102,11 @@ public:
     return ret;
   }
 
+  /// @return true if object is snapdir
+  bool is_snapdir() const {
+    return snap == CEPH_SNAPDIR;
+  }
+
   /// @return true if object is head
   bool is_head() const {
     return snap == CEPH_NOSNAP;

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 8daeef90efda8ee09a8ffd33c1cd383820723624..23012e83b65bca4d64e95806141968ec878b3db6 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -11109,11 +11109,6 @@ void ReplicatedPG::_scrub(ScrubMap& scrubmap)
        }         
       }
     }
-    if (soid.snap == CEPH_SNAPDIR) {
-      string cat;
-      scrub_cstat.add(stat, cat);
-      continue;
-    }
 
     // basic checks.
     if (p->second.attrs.count(OI_ATTR) == 0) {
@@ -11140,10 +11135,12 @@ void ReplicatedPG::_scrub(ScrubMap& scrubmap)
 
     stat.num_bytes += oi.size;
 
-    if (oi.is_dirty())
-      ++stat.num_objects_dirty;
-    if (oi.is_whiteout())
-      ++stat.num_whiteouts;
+    if (!soid.is_snapdir()) {
+      if (oi.is_dirty())
+       ++stat.num_objects_dirty;
+      if (oi.is_whiteout())
+       ++stat.num_whiteouts;
+    }
 
     //bufferlist data;
     //osd->store->read(c, poid, 0, 0, data);