From: Yehuda Sadeh <yehuda@inktank.com>
Date: Tue, 2 Oct 2012 00:17:14 +0000 (-0700)
Subject: radosgw-admin: usage should time out after 20 minutes
X-Git-Tag: 1.1.0~2440
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7c9dc932e1f8b302a7ff669cd9ec4542949b2e94;p=teuthology.git

radosgw-admin: usage should time out after 20 minutes

Not 45 seconds.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/teuthology/task/radosgw-admin.py b/teuthology/task/radosgw-admin.py
index fd3025e9d..6bc4b33b0 100644
--- a/teuthology/task/radosgw-admin.py
+++ b/teuthology/task/radosgw-admin.py
@@ -320,13 +320,13 @@ def task(ctx, config):
 
     # need to wait for all usage data to get flushed, should take up to 30 seconds
     timestamp = time.time()
-    while time.time() - timestamp <= 45:
+    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:
             break;
         time.sleep(1)
 
-    assert time.time() - timestamp <= 45
+    assert time.time() - timestamp <= (20 * 60)
 
     # TESTCASE 'usage-show' 'usage' 'show' 'all usage' 'succeeds'
     (err, out) = rgwadmin(ctx, client, ['usage', 'show'])