From: David Zafman <dzafman@redhat.com>
Date: Fri, 5 Jun 2015 01:47:42 +0000 (-0700)
Subject: osd: CEPH_FEATURE_CHUNKY_SCRUB feature now required
X-Git-Tag: v0.94.6~13^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3066231865e2fe56344de9db26024ac65e03053d;p=ceph.git

osd: CEPH_FEATURE_CHUNKY_SCRUB feature now required

Feature present since at least the Dumpling release.
A later commit will add it to the osd_required mask

Fixes: #11661

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 7a10a7e196efd0f59fa7adb87d0a120655b227d8)
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index df5b34d3f4b..49d0af1385f 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3818,26 +3818,8 @@ void PG::scrub(ThreadPool::TPHandle &handle)
     return;
   }
 
-  // when we're starting a scrub, we need to determine which type of scrub to do
   if (!scrubber.active) {
-    OSDMapRef curmap = osd->get_osdmap();
     assert(backfill_targets.empty());
-    for (unsigned i=0; i<acting.size(); i++) {
-      if (acting[i] == pg_whoami.osd)
-	continue;
-      if (acting[i] == CRUSH_ITEM_NONE)
-	continue;
-      ConnectionRef con = osd->get_con_osd_cluster(acting[i], get_osdmap()->get_epoch());
-      if (!con)
-	continue;
-      if (!con->has_feature(CEPH_FEATURE_CHUNKY_SCRUB)) {
-        dout(20) << "OSD " << acting[i]
-                 << " does not support chunky scrubs, falling back to classic"
-                 << dendl;
-        assert(0 == "Running incompatible OSD");
-        break;
-      }
-    }
 
     scrubber.deep = state_test(PG_STATE_DEEP_SCRUB);