Revert "osd: fix arithmetic exception when scrub_min_interval is small"

This reverts commit a828a4df54.
This commit is contained in:
Samuel Just 2016-01-05 15:18:33 -08:00
parent d0f4d2d634
commit 64cb6e5569

View File

@ -6088,10 +6088,9 @@ OSDService::ScrubJob::ScrubJob(const spg_t& pg, const utime_t& timestamp,
pool_scrub_max_interval : g_conf->osd_scrub_max_interval;
sched_time += scrub_min_interval;
int divisor = scrub_min_interval *
g_conf->osd_scrub_interval_randomize_ratio;
if (divisor > 0) {
sched_time += rand() % divisor;
if (g_conf->osd_scrub_interval_randomize_ratio > 0) {
sched_time += rand() % (int)(scrub_min_interval *
g_conf->osd_scrub_interval_randomize_ratio);
}
deadline += scrub_max_interval;
}