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

This reverts commit a828a4df54f040a39f54c4cdecde234376301be5.

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1d0ca9c57f21e0dcaa17f6742506227b359ef3f7..f89bd828cebd5ce700b53c24a5358e6585e26d0f 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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;
   }