RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 09:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18354 from kungf/no_scurb_deadline

Browse Source 
osd: make scrub no deadline when max interval is zero

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
Sage Weil 2017-10-20 17:22:43 -05:00 committed by GitHub
commit 1cb521e08c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osd/OSD.cc
View File

@ -6904,7 +6904,12 @@ OSDService::ScrubJob::ScrubJob(CephContext* cct,
double r = rand() / (double)RAND_MAX;
sched_time +=
scrub_min_interval * cct->_conf->osd_scrub_interval_randomize_ratio * r;
deadline += scrub_max_interval;
if (scrub_max_interval == 0) {
deadline = utime_t();
} else {
deadline += scrub_max_interval;
}
}
}
@ -7007,7 +7012,7 @@ void OSD::sched_scrub()
break;
}
if ((scrub.deadline >= now) && !(time_permit && load_is_low)) {
if ((scrub.deadline.is_zero() || scrub.deadline >= now) && !(time_permit && load_is_low)) {
dout(10) << __func__ << " not scheduling scrub for " << scrub.pgid << " due to "
<< (!time_permit ? "time not permit" : "high load") << dendl;
continue;