From: xie xingguo Date: Wed, 20 Apr 2016 06:59:44 +0000 (+0800) Subject: osd: kill PG_STATE_SCRUBQ state, which is never used X-Git-Tag: v11.0.0~840^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8651%2Fhead;p=ceph.git osd: kill PG_STATE_SCRUBQ state, which is never used Signed-off-by: xie xingguo --- diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index c5f790653fd5..d15b1f1d1260 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -816,8 +816,6 @@ std::string pg_state_string(int state) oss << "scrubbing+"; if (state & PG_STATE_DEEP_SCRUB) oss << "deep+"; - if (state & PG_STATE_SCRUBQ) - oss << "scrubq+"; if (state & PG_STATE_INCONSISTENT) oss << "inconsistent+"; if (state & PG_STATE_PEERING) @@ -858,8 +856,6 @@ int pg_string_state(const std::string& state) type = PG_STATE_SPLITTING; else if (state == "scrubbing") type = PG_STATE_SCRUBBING; - else if (state == "scrubq") - type = PG_STATE_SCRUBQ; else if (state == "degraded") type = PG_STATE_DEGRADED; else if (state == "inconsistent") diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 2dd16b012cad..2526ca787e16 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -905,7 +905,7 @@ inline ostream& operator<<(ostream& out, const osd_stat_t& s) { //#define PG_STATE_STRAY (1<<6) // i must notify the primary i exist. #define PG_STATE_SPLITTING (1<<7) // i am splitting #define PG_STATE_SCRUBBING (1<<8) // scrubbing -#define PG_STATE_SCRUBQ (1<<9) // queued for scrub +//#define PG_STATE_SCRUBQ (1<<9) // queued for scrub #define PG_STATE_DEGRADED (1<<10) // pg contains objects with reduced redundancy #define PG_STATE_INCONSISTENT (1<<11) // pg replicas are inconsistent (but shouldn't be) #define PG_STATE_PEERING (1<<12) // pg is (re)peering