watch_lock("OSDService::watch_lock"),
watch_timer(osd->client_messenger->cct, watch_lock),
next_notif_id(0),
- backfill_request_lock("OSDService::backfill_request_lock"),
- backfill_request_timer(cct, backfill_request_lock, false),
+ recovery_request_lock("OSDService::recovery_request_lock"),
+ recovery_request_timer(cct, recovery_request_lock, false),
reserver_finisher(cct),
local_reserver(&reserver_finisher, cct->_conf->osd_max_backfills,
cct->_conf->osd_min_recovery_priority),
objecter_finisher.stop();
{
- Mutex::Locker l(backfill_request_lock);
- backfill_request_timer.shutdown();
+ Mutex::Locker l(recovery_request_lock);
+ recovery_request_timer.shutdown();
}
{
tick_timer.init();
tick_timer_without_osd_lock.init();
- service.backfill_request_timer.init();
+ service.recovery_request_timer.init();
// mount.
dout(2) << "mounting " << dev_path << " "
return (((uint64_t)cur_epoch) << 32) | ((uint64_t)(next_notif_id++));
}
- // -- Backfill Request Scheduling --
- Mutex backfill_request_lock;
- SafeTimer backfill_request_timer;
+ // -- Recovery/Backfill Request Scheduling --
+ Mutex recovery_request_lock;
+ SafeTimer recovery_request_timer;
// -- tids --
// for ops i issue
void PG::schedule_backfill_full_retry()
{
- Mutex::Locker lock(osd->backfill_request_lock);
- osd->backfill_request_timer.add_event_after(
+ Mutex::Locker lock(osd->recovery_request_lock);
+ osd->recovery_request_timer.add_event_after(
cct->_conf->osd_backfill_retry_interval,
new QueuePeeringEvt<RequestBackfill>(
this, get_osdmap()->get_epoch(),