osd: kill PG_STATE_SCRUBQ state, which is never used

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index c5f790653fd5751244c1a88ba41a24fb1db3342c..d15b1f1d12605305f1a5d5320713c01b88db8574 100644 (file)
--- 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 2dd16b012cad686f2b589f54b6aab4c458b2b7ca..2526ca787e162495b1aa50abcfeb0b65af9fe816 100644 (file)
--- 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