osd: drop vestigal invalid_snapcolls fields from scrub

This isn't used.  Snapcolls are ancient.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index f202b8dfc47bc7995d5499c56cfd970455ceb96e..eea7ffd323df41068b68b88574ba4328982a392d 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4187,14 +4187,13 @@ void PG::scrub_compare_maps()
       scrubber.missing,
       scrubber.inconsistent,
       authoritative,
-      scrubber.inconsistent_snapcolls,
       scrubber.shallow_errors,
       scrubber.deep_errors,
       info.pgid, acting,
       ss);
     dout(2) << ss.str() << dendl;
 
-    if (!authoritative.empty() || !scrubber.inconsistent_snapcolls.empty()) {
+    if (!authoritative.empty()) {
       osd->clog->error(ss);
     }
 
@@ -4228,19 +4227,6 @@ void PG::scrub_process_inconsistent()
 
   if (!scrubber.authoritative.empty() || !scrubber.inconsistent.empty()) {
     stringstream ss;
-    for (map<hobject_t, set<pg_shard_t> >::iterator obj =
-          scrubber.inconsistent_snapcolls.begin();
-        obj != scrubber.inconsistent_snapcolls.end();
-        ++obj) {
-      for (set<pg_shard_t>::iterator j = obj->second.begin();
-          j != obj->second.end();
-          ++j) {
-       ++scrubber.shallow_errors;
-       ss << info.pgid << " " << mode << " " << " object " << obj->first
-          << " has inconsistent snapcolls on " << *j << std::endl;
-      }
-    }
-
     ss << info.pgid << " " << mode << " "
        << scrubber.missing.size() << " missing, "
        << scrubber.inconsistent.size() << " inconsistent objects";

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 1670d8661e76ffe4923d24b2c5f4215384d10bbe..21fed9c2f7856f5dbbf000ca614517112421c8e3 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1059,7 +1059,6 @@ public:
     // Maps from objects with errors to missing/inconsistent peers
     map<hobject_t, set<pg_shard_t> > missing;
     map<hobject_t, set<pg_shard_t> > inconsistent;
-    map<hobject_t, set<pg_shard_t> > inconsistent_snapcolls;
 
     // Map from object with errors to good peer
     map<hobject_t, pair<ScrubMap::object, pg_shard_t> > authoritative;

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index 3c50d895e27cdda60b98955974f7c60b53a0cb17..4c4787cc5058153b7b031df3ba582a5dac16dbb4 100644 (file)
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -519,7 +519,6 @@ void PGBackend::be_compare_scrubmaps(
   map<hobject_t, set<pg_shard_t> > &missing,
   map<hobject_t, set<pg_shard_t> > &inconsistent,
   map<hobject_t, pg_shard_t> &authoritative,
-  map<hobject_t, set<pg_shard_t> > &invalid_snapcolls,
   int &shallow_errors, int &deep_errors,
   const spg_t& pgid,
   const vector<int> &acting,

diff --git a/src/osd/PGBackend.h b/src/osd/PGBackend.h
index 8b6c397750c2c0f37fa3179649bebf0d5d661933..3b9f2532356039107743584da0eb9b2475244d3c 100644 (file)
--- a/src/osd/PGBackend.h
+++ b/src/osd/PGBackend.h
@@ -599,7 +599,6 @@
      map<hobject_t, set<pg_shard_t> > &missing,
      map<hobject_t, set<pg_shard_t> > &inconsistent,
      map<hobject_t, pg_shard_t> &authoritative,
-     map<hobject_t, set<pg_shard_t> > &invalid_snapcolls,
      int &shallow_errors, int &deep_errors,
      const spg_t& pgid,
      const vector<int> &acting,