From: Samuel Just <sam.just@inktank.com>
Date: Mon, 24 Feb 2014 00:02:43 +0000 (-0800)
Subject: PG: skip pg_whoami.osd, not pg_whoami.shard in scrub feature check
X-Git-Tag: v0.78~122^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1307%2Fhead;p=ceph.git

PG: skip pg_whoami.osd, not pg_whoami.shard in scrub feature check

Caused by typo in 68184d4574cd507ab3a065693e392917b98e16ec.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 164dc3ad4240..f212425a6a39 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3595,7 +3595,7 @@ void PG::scrub(ThreadPool::TPHandle &handle)
     scrubber.is_chunky = true;
     assert(backfill_targets.empty());
     for (unsigned i=0; i<acting.size(); i++) {
-      if (acting[i] == pg_whoami.shard)
+      if (acting[i] == pg_whoami.osd)
 	continue;
       if (acting[i] == CRUSH_ITEM_NONE)
 	continue;