From 03287f7d221fa3713193f8a9f1f79f71e9e80372 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 27 Feb 2017 14:29:02 -0500 Subject: [PATCH] qa/workunits/cephtool/test.sh: change [near]full_ratio tests Signed-off-by: Sage Weil --- qa/workunits/cephtool/test.sh | 11 +++++------ qa/workunits/rest/test.py | 14 +++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index b7fc9c85b6a..a5066fb0d7d 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1401,12 +1401,11 @@ function test_mon_pg() ceph pg repair 0.0 ceph pg scrub 0.0 - ceph pg set_full_ratio 0.90 - ceph pg dump --format=plain | grep '^full_ratio 0.9' - ceph pg set_full_ratio 0.95 - ceph pg set_nearfull_ratio 0.90 - ceph pg dump --format=plain | grep '^nearfull_ratio 0.9' - ceph pg set_nearfull_ratio 0.85 + ceph osd set-full-ratio .962 + ceph osd dump | grep '^full_ratio 0.962' + ceph osd set-nearfull-ratio .892 + ceph osd dump | grep '^nearfull_ratio 0.892' + ceph pg stat | grep 'pgs:' ceph pg 0.0 query ceph tell 0.0 query diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py index b63bbc50b64..1208f85b907 100755 --- a/qa/workunits/rest/test.py +++ b/qa/workunits/rest/test.py @@ -355,14 +355,14 @@ if __name__ == '__main__': expect('pg/repair?pgid=0.0', 'PUT', 200, '') expect('pg/scrub?pgid=0.0', 'PUT', 200, '') - expect('pg/set_full_ratio?ratio=0.90', 'PUT', 200, '') - r = expect('pg/dump', 'GET', 200, 'json', JSONHDR) + expect('osd/set-full-ratio?ratio=0.90', 'PUT', 200, '') + r = expect('osd/dump', 'GET', 200, 'json', JSONHDR) assert(float(r.myjson['output']['full_ratio']) == 0.90) - expect('pg/set_full_ratio?ratio=0.95', 'PUT', 200, '') - expect('pg/set_nearfull_ratio?ratio=0.90', 'PUT', 200, '') - r = expect('pg/dump', 'GET', 200, 'json', JSONHDR) - assert(float(r.myjson['output']['near_full_ratio']) == 0.90) - expect('pg/set_full_ratio?ratio=0.85', 'PUT', 200, '') + expect('osd/set-full-ratio?ratio=0.95', 'PUT', 200, '') + expect('osd/set-nearfull-ratio?ratio=0.90', 'PUT', 200, '') + r = expect('osd/dump', 'GET', 200, 'json', JSONHDR) + assert(float(r.myjson['output']['nearfull_ratio']) == 0.90) + expect('osd/set-full-ratio?ratio=0.85', 'PUT', 200, '') r = expect('pg/stat', 'GET', 200, 'json', JSONHDR) assert('num_pgs' in r.myjson['output']) -- 2.47.3