From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 16 May 2017 14:22:24 +0000 (-0400)
Subject: test/rgw: add timing config options to test_multi.py
X-Git-Tag: v12.1.0~10^2~50^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e90bba65c44ffca9a7706f2e1d920a8a250b76b8;p=ceph.git

test/rgw: add timing config options to test_multi.py

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/test/rgw/test_multi.py b/src/test/rgw/test_multi.py
index b9f3f5ed09ea..e8bd5f127122 100644
--- a/src/test/rgw/test_multi.py
+++ b/src/test/rgw/test_multi.py
@@ -152,6 +152,9 @@ def init(parse_args):
                                          'log_file': None,
                                          'file_log_level': 20,
                                          'tenant': None,
+                                         'checkpoint_retries': 60,
+                                         'checkpoint_delay': 5,
+                                         'reconfigure_delay': 5,
                                          })
     try:
         path = os.environ['RGW_MULTI_TEST_CONF']
@@ -178,6 +181,9 @@ def init(parse_args):
     parser.add_argument('--log-file', type=str, default=cfg.get(section, 'log_file'))
     parser.add_argument('--file-log-level', type=int, default=cfg.getint(section, 'file_log_level'))
     parser.add_argument('--tenant', type=str, default=cfg.get(section, 'tenant'))
+    parser.add_argument('--checkpoint-retries', type=int, default=cfg.getint(section, 'checkpoint_retries'))
+    parser.add_argument('--checkpoint-delay', type=int, default=cfg.getint(section, 'checkpoint_delay'))
+    parser.add_argument('--reconfigure-delay', type=int, default=cfg.getint(section, 'reconfigure_delay'))
 
     argv = []
 
@@ -297,7 +303,10 @@ def init(parse_args):
     if not bootstrap:
         period.get(c1)
 
-    init_multi(realm, user)
+    config = Config(checkpoint_retries=args.checkpoint_retries,
+                    checkpoint_delay=args.checkpoint_delay,
+                    reconfigure_delay=args.reconfigure_delay)
+    init_multi(realm, user, config)
 
 def setup_module():
     init(False)