From: Samuel Just <sjust@redhat.com>
Date: Wed, 4 Mar 2020 09:35:04 +0000 (+0800)
Subject: osd: add some clean ups
X-Git-Tag: v16.1.0~2488^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ae73f0fb9bf4ecc066c4aa01cfd88b19c8d5cc3;p=ceph.git

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 53b50b5c7a51..ec3e365843ce 100644
--- 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 f5b7062b42e2..08d3a39bcc30 100644
--- 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;