]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/PGMonitor: avoid uint64_t overflow when checking pool 'target/max' status. 5409/head
authorhuangjun <hjwsm1989@gmail.com>
Mon, 20 Jul 2015 02:50:20 +0000 (10:50 +0800)
committerNathan Cutler <ncutler@suse.com>
Wed, 29 Jul 2015 18:06:18 +0000 (20:06 +0200)
Fixes: #12401
Signed-off-by: huangjun <hjwsm1989@gmail.com>
(cherry picked from commit f84e6b8157e78fd05cd1c8ac957c92df17e6ba06)

src/mon/PGMonitor.cc

index 3e0523bba898dcfcb9bb5dd93c7e5e8898a446d9..c2486354c2ddaea0b404005e0f2d1b392869ebed 100644 (file)
@@ -1991,7 +1991,7 @@ void PGMonitor::get_health(list<pair<health_status_t,string> >& summary,
       ((1000000 - p->second.cache_target_full_ratio_micro) *
        g_conf->mon_cache_target_full_warn_ratio);
     if (p->second.target_max_objects && (uint64_t)st.stats.sum.num_objects >
-       p->second.target_max_objects * ratio / 1000000) {
+       p->second.target_max_objects * (ratio / 1000000.0)) {
       nearfull = true;
       if (detail) {
        ostringstream ss;
@@ -2003,7 +2003,7 @@ void PGMonitor::get_health(list<pair<health_status_t,string> >& summary,
       }
     }
     if (p->second.target_max_bytes && (uint64_t)st.stats.sum.num_bytes >
-       p->second.target_max_bytes * ratio / 1000000) {
+       p->second.target_max_bytes * (ratio / 1000000.0)) {
       nearfull = true;
       if (detail) {
        ostringstream ss;