]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/PGMonitor: avoid uint64_t overflow when checking pool 'target/max' status. 5288/head
authorhuangjun <hjwsm1989@gmail.com>
Mon, 20 Jul 2015 02:50:20 +0000 (10:50 +0800)
committerhuangjun <hjwsm1989@gmail.com>
Mon, 20 Jul 2015 06:16:59 +0000 (14:16 +0800)
Fixes: #12401
Signed-off-by: huangjun <hjwsm1989@gmail.com>
src/mon/PGMonitor.cc

index a3eb9340df8e13b18e559805acd1cdd5e8a13e4b..3225ef629d89358392f39fb5ffbd420c92324dd8 100644 (file)
@@ -2123,7 +2123,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;
@@ -2135,7 +2135,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;