Show the pool quota info on ceph df detial command

signed-off-by: song.baisen@zte.com.cn
ceph · Jan 4, 2016 · ca70534 · ca70534
1 parent 8676120
commit ca70534
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
@@ -1394,8 +1394,11 @@ void PGMonitor::dump_pool_stats(stringstream &ss, Formatter *f, bool verbose)
   } else {
     tbl.define_column("NAME", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("ID", TextTable::LEFT, TextTable::LEFT);
-    if (verbose)
+    if (verbose) {
       tbl.define_column("CATEGORY", TextTable::LEFT, TextTable::LEFT);
+      tbl.define_column("MAX OBJECTS", TextTable::LEFT, TextTable::LEFT);
+      tbl.define_column("MAX BYTES(B)", TextTable::LEFT, TextTable::LEFT);
+    }
     tbl.define_column("USED", TextTable::LEFT, TextTable::RIGHT);
     tbl.define_column("%USED", TextTable::LEFT, TextTable::RIGHT);
     tbl.define_column("MAX AVAIL", TextTable::LEFT, TextTable::RIGHT);
@@ -1461,6 +1464,15 @@ void PGMonitor::dump_pool_stats(stringstream &ss, Formatter *f, bool verbose)
           << pool_id;
       if (verbose)
         tbl << "-";
+      if (pool->quota_max_objects == 0)
+        tbl << "N/A";
+      else
+        tbl << si_t(pool->quota_max_objects);
+
+      if (pool->quota_max_bytes == 0)
+        tbl << "N/A";
+      else
+        tbl <<si_t( pool->quota_max_bytes);
     }
     dump_object_stat_sum(tbl, f, stat.stats.sum, avail, verbose);
     if (f)