osd: fix arithmetic exception when scrub_min_interval is small

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
ceph · Dec 7, 2015 · e4925a7 · e4925a7
1 parent 4b0c2b7
commit e4925a7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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;
   }