From: huanwen ren <ren.huanwen@zte.com.cn>
Date: Thu, 12 May 2016 01:32:04 +0000 (+0800)
Subject: osd/osdmonitor: pool of objects beyond quota should be warn, when the pool bytes... 
X-Git-Tag: ses5-milestone5~448^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9085%2Fhead;p=ceph.git

osd/osdmonitor: pool of objects beyond quota should be warn, when the pool bytes beyond set quotas

pool of objects beyond quota should be warn, when the pool bytes beyond set quotas

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 42c58a0111a..8f5a2ee4605 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4065,13 +4065,12 @@ bool OSDMonitor::update_pools_status()
         mon->clog->warn() << "pool '" << pool_name << "' is full"
                          << " (reached quota's max_bytes: "
                          << si_t(pool.quota_max_bytes) << ")";
-      } else if (pool.quota_max_objects > 0 &&
+      }
+      if (pool.quota_max_objects > 0 &&
 		 (uint64_t)sum.num_objects >= pool.quota_max_objects) {
         mon->clog->warn() << "pool '" << pool_name << "' is full"
                          << " (reached quota's max_objects: "
                          << pool.quota_max_objects << ")";
-      } else {
-        assert(0 == "we shouldn't reach this");
       }
       update_pool_flags(it->first, pool.get_flags() | pg_pool_t::FLAG_FULL);
       ret = true;