From a828a4df54f040a39f54c4cdecde234376301be5 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Mon, 7 Dec 2015 08:53:23 +0200 Subject: [PATCH] osd: fix arithmetic exception when scrub_min_interval is small Signed-off-by: Mykola Golub --- src/osd/OSD.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 7425cc7e6b6e..766dedfb9e53 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -6088,9 +6088,10 @@ 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; - if (g_conf->osd_scrub_interval_randomize_ratio > 0) { - sched_time += rand() % (int)(scrub_min_interval * - g_conf->osd_scrub_interval_randomize_ratio); + int divisor = scrub_min_interval * + g_conf->osd_scrub_interval_randomize_ratio; + if (divisor > 0) { + sched_time += rand() % divisor; } deadline += scrub_max_interval; } -- 2.47.3