ensure summary is looked for the user we need (part 2)

Move the get_user_summary(out, user) logic to util.rgw so that it can be
shared between radosgw_admin_rest.py and radosgw_admin.py and modify
them accordingly.

http://tracker.ceph.com/issues/11180 Fixes: #11180

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 97e6d808f086834f2350084d5de36be285ad2bde)

Conflicts:
	tasks/radosgw_admin.py
        the context around def successful_ops(out): changed but is
	unrelated to the modification

diff --git a/tasks/radosgw_admin.py b/tasks/radosgw_admin.py
index 92cbe3007d84d394f5aa6f6a27057761b33f50d2..453f4f561de5a42d45c5097449d6c299dbb580fc 100644 (file)
--- a/tasks/radosgw_admin.py
+++ b/tasks/radosgw_admin.py
@@ -21,20 +21,10 @@ import boto.s3.acl
 import util.rgw as rgw_utils
 
 from teuthology import misc as teuthology
-from util.rgw import rgwadmin
+from util.rgw import rgwadmin, get_user_summary, get_user_successful_ops
 
 log = logging.getLogger(__name__)
 
-
-def successful_ops(out):
-    """Extract total from the first summary entry (presumed to be only one)"""
-    summary = out['summary']
-    if len(summary) == 0:
-        return 0
-    entry = summary[0]
-    return entry['total']['successful_ops']
-
-
 def get_acl(key):
     """
     Helper function to get the xml acl from a key, ensuring that the xml
@@ -793,7 +783,7 @@ def task(ctx, config):
     timestamp = time.time()
     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
-        if successful_ops(out) > 0:
+        if get_user_successful_ops(out, user1) > 0:
             break
         time.sleep(1)
 
@@ -804,14 +794,7 @@ def task(ctx, config):
     assert len(out['entries']) > 0
     assert len(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)
+    user_summary = get_user_summary(out, user1)
 
     total = user_summary['total']
     assert total['successful_ops'] > 0

diff --git a/tasks/radosgw_admin_rest.py b/tasks/radosgw_admin_rest.py
index 866ff4f10e1fea8da0cbe6a446e759b365a9ba06..7bd72d19536c1854ec923ea3616a883dd53416c1 100644 (file)
--- a/tasks/radosgw_admin_rest.py
+++ b/tasks/radosgw_admin_rest.py
@@ -20,20 +20,10 @@ import time
 
 from boto.connection import AWSAuthConnection
 from teuthology import misc as teuthology
+from util.rgw import get_user_summary, get_user_successful_ops
 
 log = logging.getLogger(__name__)
 
-def successful_ops(out):
-    """
-    Extract successful operations
-    :param out: list
-    """
-    summary = out['summary']
-    if len(summary) == 0:
-        return 0
-    entry = summary[0]
-    return entry['total']['successful_ops']
-
 def rgwadmin(ctx, client, cmd):
     """
     Perform rgw admin command
@@ -522,7 +512,7 @@ def task(ctx, config):
     while time.time() - timestamp <= (20 * 60):      # wait up to 20 minutes
         (ret, out) = rgwadmin_rest(admin_conn, ['usage', 'show'], {'categories' : 'delete_obj'})  # last operation we did is delete obj, wait for it to flush
 
-        if successful_ops(out) > 0:
+        if get_user_successful_ops(out, user1) > 0:
             break
         time.sleep(1)
 
@@ -533,7 +523,7 @@ def task(ctx, config):
     assert ret == 200
     assert len(out['entries']) > 0
     assert len(out['summary']) > 0
-    user_summary = out['summary'][0]
+    user_summary = get_user_summary(out, user1)
     total = user_summary['total']
     assert total['successful_ops'] > 0
 

diff --git a/tasks/util/rgw.py b/tasks/util/rgw.py
index ef61a3fd7cde4dc81476a71cd106cf188b833fad..e5fba9f82f9a96f11d1483d9eddc6708bd6ef129 100644 (file)
--- a/tasks/util/rgw.py
+++ b/tasks/util/rgw.py
@@ -49,6 +49,24 @@ def rgwadmin(ctx, client, cmd, stdin=StringIO(), check_status=False):
             log.info(' raw result: %s' % j)
     return (r, j)
 
+def get_user_summary(out, user):
+    """Extract the summary for a given user"""
+    user_summary = None
+    for summary in out['summary']:
+        if summary.get('user') == user:
+            user_summary = summary
+
+    if not user_summary:
+        raise AssertionError('No summary info found for user: %s' % user)
+
+    return user_summary
+
+def get_user_successful_ops(out, user):
+    summary = out['summary']
+    if len(summary) == 0:
+        return 0
+    return get_user_summary(out, user)['total']['successful_ops']
+
 def get_zone_host_and_port(ctx, client, zone):
     _, region_map = rgwadmin(ctx, client, check_status=True,
                              cmd=['-n', client, 'region-map', 'get'])