RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-12-25 13:23:06 -05:00
parent f198ba81cc
commit 88d85ad726
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qa/workunits/cephtool/test.sh
View File

@ -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

4
qa/workunits/rest/test.py
View File

@ -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'])

3
src/mon/PGMap.cc
View File

@ -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

8
src/test/mon/test_pool_quota.sh
View File

@ -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