]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/osd_types: remove weird BACKFILL state hack
authorSage Weil <sage@redhat.com>
Thu, 21 Sep 2017 14:28:08 +0000 (10:28 -0400)
committerSage Weil <sage@redhat.com>
Thu, 28 Sep 2017 19:14:50 +0000 (15:14 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5bcfaf4bd40fee9ea4bfd5ed086b51facc5fe78e)

src/osd/osd_types.cc

index 393cd7097d23fdb9483949fd2571e506fc31f629..0d3a310bd917eafa82607640fb3aa92b33fba8a1 100644 (file)
@@ -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+";