From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Sep 2017 14:28:08 +0000 (-0400)
Subject: osd/osd_types: remove weird BACKFILL state hack
X-Git-Tag: v13.0.1~757^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bcfaf4bd40fee9ea4bfd5ed086b51facc5fe78e;p=ceph.git

osd/osd_types: remove weird BACKFILL state hack

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

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 7f10196aeb61..2b89e5dc2613 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -827,8 +827,7 @@ std::string pg_state_string(int state)
     oss << "peering+";
   if (state & PG_STATE_REPAIR)
     oss << "repair+";
-  if ((state & PG_STATE_BACKFILL_WAIT) &&
-      !(state &PG_STATE_BACKFILL))
+  if (state & PG_STATE_BACKFILL_WAIT)
     oss << "backfill_wait+";
   if (state & PG_STATE_BACKFILL)
     oss << "backfilling+";