]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test/rgw: add timing config options to test_multi.py
authorCasey Bodley <cbodley@redhat.com>
Tue, 16 May 2017 14:22:24 +0000 (10:22 -0400)
committerCasey Bodley <cbodley@redhat.com>
Thu, 18 May 2017 17:38:44 +0000 (13:38 -0400)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/test/rgw/test_multi.py

index b9f3f5ed09eaecafc571dabc1bc44222423c6788..e8bd5f1271224dbc48d3b8bd70bb213b7691bc76 100644 (file)
@@ -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)