From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Thu, 2 Nov 2017 12:17:22 +0000 (+0800)
Subject: osd/PG: use osd_backfill_retry_interval for schedule_backfill_retry()
X-Git-Tag: v13.0.1~299^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6086edb50607bdad1d8d2fc9f610edb8884b955;p=ceph.git

osd/PG: use osd_backfill_retry_interval for schedule_backfill_retry()

These two options currently share the same value and I have no particular
preference, but using osd_backfill_retry_interval for the specific scenario
gives us more flexible choices.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 195f065f3fb7..da1404200d0b 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6467,7 +6467,7 @@ PG::RecoveryState::Backfilling::react(const RemoteReservationRevokedTooFull &)
   pg->state_set(PG_STATE_BACKFILL_TOOFULL);
   pg->state_clear(PG_STATE_BACKFILLING);
   cancel_backfill();
-  pg->schedule_backfill_retry(pg->cct->_conf->osd_recovery_retry_interval);
+  pg->schedule_backfill_retry(pg->cct->_conf->osd_backfill_retry_interval);
   return transit<NotBackfilling>();
 }
 
@@ -6569,7 +6569,7 @@ void PG::RecoveryState::WaitRemoteBackfillReserved::retry()
   pg->state_set(PG_STATE_BACKFILL_TOOFULL);
   pg->publish_stats_to_osd();
 
-  pg->schedule_backfill_retry(pg->cct->_conf->osd_recovery_retry_interval);
+  pg->schedule_backfill_retry(pg->cct->_conf->osd_backfill_retry_interval);
 }
 
 boost::statechart::result