]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: use osd_backfill_retry_interval for schedule_backfill_retry() 18686/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Thu, 2 Nov 2017 12:17:22 +0000 (20:17 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Thu, 2 Nov 2017 12:17:22 +0000 (20:17 +0800)
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>
src/osd/PG.cc

index 195f065f3fb746fbca91b6aeb71356096b4fca46..da1404200d0bc0c5afd971ee34f6b3c84ea23475 100644 (file)
@@ -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