From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Mon, 1 Apr 2013 16:14:15 +0000 (+0100)
Subject: mon: OSDMonitor: only output warn/err messages if quotas are set > 0
X-Git-Tag: v0.62~122
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cbb38a1cbbb9b50caaaa04154a947f3d69a9a403;p=ceph.git

mon: OSDMonitor: only output warn/err messages if quotas are set > 0

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 3acfee89b00..b76511cb963 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2241,11 +2241,13 @@ bool OSDMonitor::update_pools_status()
       if (!pool_is_full)
 	continue;
 
-      if ((uint64_t)sum.num_bytes >= pool.quota_max_bytes) {
+      if (pool.quota_max_bytes > 0 &&
+          (uint64_t)sum.num_bytes >= pool.quota_max_bytes) {
         mon->clog.warn() << "pool '" << pool_name << "' is full"
                          << " (reached quota's max_bytes: "
                          << si_t(pool.quota_max_bytes) << ")";
-      } else if ((uint64_t)sum.num_objects >= pool.quota_max_objects) {
+      } else 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 << ")";