]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: fix divide by zero when pg_num adjusted and no osds
authorSage Weil <sage@redhat.com>
Wed, 13 Aug 2014 20:31:10 +0000 (13:31 -0700)
committerSage Weil <sage@redhat.com>
Wed, 13 Aug 2014 20:32:03 +0000 (13:32 -0700)
Fixes: #9052
Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 239401db7b51541a57c59a261b89e0f05347c32d)

src/mon/OSDMonitor.cc

index fbe03531837d76d1bba830212301cc6d2cd22a85..ca36078d4794aff954d71a554278724c874d2b05 100644 (file)
@@ -3497,7 +3497,7 @@ int OSDMonitor::prepare_command_pool_set(map<string,cmd_vartype> &cmdmap,
       ss << "splits in cache pools must be followed by scrubs and leave sufficient free space to avoid overfilling.  use --yes-i-really-mean-it to force.";
       return -EPERM;
     }
-    int expected_osds = MIN(p.get_pg_num(), osdmap.get_num_osds());
+    int expected_osds = MAX(1, MIN(p.get_pg_num(), osdmap.get_num_osds()));
     int64_t new_pgs = n - p.get_pg_num();
     int64_t pgs_per_osd = new_pgs / expected_osds;
     if (pgs_per_osd > g_conf->mon_osd_max_split_count) {