osd: add some clean ups

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index 53b50b5c7a51db58987f0e5a87ecf9771fd9a5bc..ec3e365843ce3200bb58440acf3c0a8c31a4e322 100644 (file)
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -2159,6 +2159,9 @@ public:
   bool is_recovery_unfound() const {
     return state_test(PG_STATE_RECOVERY_UNFOUND);
   }
+  bool is_backfilling() const {
+    return state_test(PG_STATE_BACKFILLING);
+  }
   bool is_backfill_unfound() const {
     return state_test(PG_STATE_BACKFILL_UNFOUND);
   }

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index f5b7062b42e2a1977980815d9da143e7d964b62f..08d3a39bcc30755ddf118c4e502a0073290b20cb 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -12437,6 +12437,7 @@ bool PrimaryLogPG::start_recovery_ops(
       dout(10) << "deferring backfill due to NOREBALANCE" << dendl;
       deferred_backfill = true;
     } else if (!recovery_state.is_backfill_reserved()) {
+      /* DNMNOTE I think this branch is dead */
       dout(10) << "deferring backfill due to !backfill_reserved" << dendl;
       if (!backfill_reserving) {
        dout(10) << "queueing RequestBackfill" << dendl;