RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #372 from ceph/wip-11180

Browse Source 
ensure summary is looked for the user we need
This commit is contained in:
Andrew Schoen 2015-03-20 09:33:13 -05:00
commit dfea7dd46c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasks/radosgw_admin.py
View File

@ -821,7 +821,7 @@ def task(ctx, config):
while time.time() - timestamp <= (20 * 60): # wait up to 20 minutes while time.time() - timestamp <= (20 * 60): # wait up to 20 minutes
(err, out) = rgwadmin(ctx, client, ['usage', 'show', '--categories', 'delete_obj']) # last operation we did is delete obj, wait for it to flush (err, out) = rgwadmin(ctx, client, ['usage', 'show', '--categories', 'delete_obj']) # last operation we did is delete obj, wait for it to flush
if successful_ops(out) > 0: if successful_ops(out) > 0:
break; break
time.sleep(1) time.sleep(1)
assert time.time() - timestamp <= (20 * 60) assert time.time() - timestamp <= (20 * 60)
@ -830,7 +830,16 @@ def task(ctx, config):
(err, out) = rgwadmin(ctx, client, ['usage', 'show'], check_status=True) (err, out) = rgwadmin(ctx, client, ['usage', 'show'], check_status=True)
assert len(out['entries']) > 0 assert len(out['entries']) > 0
assert len(out['summary']) > 0 assert len(out['summary']) > 0
user_summary = out['summary'][0]
# find summary for user1
user_summary = None
for summary in out['summary']:
if summary.get('user') == user1:
user_summary = summary
if not user_summary:
raise AssertionError('No summary info found for user: %s' % user1)
total = user_summary['total'] total = user_summary['total']
assert total['successful_ops'] > 0 assert total['successful_ops'] > 0