mon/PGMap: remove CATEGORY column from 'df detail'

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 60fd51e30ee046c673faffe1fc1ad849c2e8d955..6ff62df586533b808c8db876a98e66c6cb201478 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -626,7 +626,6 @@ function test_mon_misc()
   grep GLOBAL $TMPFILE
   grep -v DIRTY $TMPFILE
   ceph df detail > $TMPFILE
-  grep CATEGORY $TMPFILE
   grep DIRTY $TMPFILE
   ceph df --format json > $TMPFILE
   grep 'total_bytes' $TMPFILE
@@ -1884,8 +1883,8 @@ function test_mon_cephdf_commands()
     sleep 1
   done
 
-  cal_raw_used_size=`ceph df detail | grep cephdf_for_test | awk -F ' ' '{printf "%d\n", 2 * $4}'`
-  raw_used_size=`ceph df detail | grep cephdf_for_test | awk -F ' '  '{print $11}'`
+  cal_raw_used_size=`ceph df detail | grep cephdf_for_test | awk -F ' ' '{printf "%d\n", 2 * $3}'`
+  raw_used_size=`ceph df detail | grep cephdf_for_test | awk -F ' '  '{print $10}'`
 
   ceph osd pool delete cephdf_for_test cephdf_for_test --yes-i-really-really-mean-it
   rm ./cephdf_for_test

diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py
index f12cf2be1356eb8ecbc2bc8211c70df886a0c36d..a6a52fc587467f5719cc9c8438cb89bf5a4bc2fe 100755 (executable)
--- a/qa/workunits/rest/test.py
+++ b/qa/workunits/rest/test.py
@@ -130,9 +130,9 @@ if __name__ == '__main__':
     assert('epoch' in r.myjson['output'])
 
     assert('GLOBAL' in expect('df', 'GET', 200, 'plain').text)
-    assert('CATEGORY' in expect('df?detail=detail', 'GET', 200, 'plain').text)
+    assert('DIRTY' in expect('df?detail=detail', 'GET', 200, 'plain').text)
     # test param with no value (treated as param=param)
-    assert('CATEGORY' in expect('df?detail', 'GET', 200, 'plain').text)
+    assert('DIRTY' in expect('df?detail', 'GET', 200, 'plain').text)
 
     r = expect('df', 'GET', 200, 'json', JSONHDR)
     assert('total_used_bytes' in r.myjson['output']['stats'])

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 72d39bcda264d9448fd0905282a2391000c4d78e..adaddf5a8b100ee97cd48d549dad481b4d0e45dc 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -1883,7 +1883,6 @@ void PGMap::dump_pool_stats(const OSDMap &osd_map, stringstream *ss,
     tbl.define_column("NAME", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("ID", TextTable::LEFT, TextTable::LEFT);
     if (verbose) {
-      tbl.define_column("CATEGORY", TextTable::LEFT, TextTable::LEFT);
       tbl.define_column("QUOTA OBJECTS", TextTable::LEFT, TextTable::LEFT);
       tbl.define_column("QUOTA BYTES", TextTable::LEFT, TextTable::LEFT);
     }
@@ -1957,8 +1956,6 @@ void PGMap::dump_pool_stats(const OSDMap &osd_map, stringstream *ss,
       tbl << pool_name
           << pool_id;
       if (verbose) {
-       tbl << "-";
-
         if (pool->quota_max_objects == 0)
           tbl << "N/A";
         else

diff --git a/src/test/mon/test_pool_quota.sh b/src/test/mon/test_pool_quota.sh
index e856e10885c5ddf0b650056c76b9baecbb99b59b..28c58bdc83962397bc391d2cc7f619cb05295df1 100755 (executable)
--- a/src/test/mon/test_pool_quota.sh
+++ b/src/test/mon/test_pool_quota.sh
@@ -36,8 +36,8 @@ function TEST_pool_quota() {
    
     local poolname=testquoa
     ceph osd  pool create $poolname 20
-    local objects=`ceph df detail | grep -w $poolname|awk '{print $4}'`
-    local bytes=`ceph df detail | grep -w $poolname|awk '{print $5}'`
+    local objects=`ceph df detail | grep -w $poolname|awk '{print $3}'`
+    local bytes=`ceph df detail | grep -w $poolname|awk '{print $4}'`
 
     echo $objects
     echo $bytes
@@ -49,8 +49,8 @@ function TEST_pool_quota() {
     ceph osd pool set-quota  $poolname   max_objects 1000
     ceph osd pool set-quota  $poolname  max_bytes 1024
 
-    objects=`ceph df detail | grep -w $poolname|awk '{print $4}'`
-    bytes=`ceph df detail | grep -w $poolname|awk '{print $5}'`
+    objects=`ceph df detail | grep -w $poolname|awk '{print $3}'`
+    bytes=`ceph df detail | grep -w $poolname|awk '{print $4}'`
    
      if [ $objects != '1000' ] || [ $bytes != '1024' ] ;
        then