auto stop-restart: change 'auto restart delay' from int to interval

cylc · Oct 31, 2018 · 3a68810 · 3a68810
1 parent d2e4956
commit 3a68810
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/lib/cylc/cfgspec/globalcfg.py b/lib/cylc/cfgspec/globalcfg.py
@@ -248,7 +248,7 @@
         'scan hosts': [VDR.V_STRING_LIST],
         'scan ports': [VDR.V_INTEGER_LIST, range(43001, 43101)],
         'condemned hosts': [VDR.V_STRING_LIST],
-        'auto restart delay': [VDR.V_INTEGER, 0],
+        'auto restart delay': [VDR.V_INTERVAL],
         'run host select': {
             'rank': [VDR.V_STRING, 'random', 'load:1', 'load:5', 'load:15',
                      'memory', 'disk-space'],

diff --git a/lib/cylc/scheduler.py b/lib/cylc/scheduler.py
@@ -1374,13 +1374,14 @@ def suite_auto_restart(self, max_retries=3):
             'manual restart required.' % max_retries)
         return False
 
-    def set_auto_restart(self, restart_delay=0):
+    def set_auto_restart(self, restart_delay=None):
         """Configure the suite to automatically stop and restart.
 
         Restart handled by `suite_auto_restart`.
 
         Args:
-            restart_delay (int): Suite will wait a random period between 0 and
+            restart_delay (cylc.cfgvalidate.DurationFloat):
+                Suite will wait a random period between 0 and
                 `restart_delay` seconds before attempting to stop/restart in
                 order to avoid multiple suites restarting simultaneously.
 

diff --git a/tests/restart/37-auto-restart-delay.t b/tests/restart/37-auto-restart-delay.t
@@ -58,7 +58,7 @@ create_test_globalrc '' "
 ${BASE_GLOBALRC}
 [suite servers]
     run hosts = localhost
-    auto restart delay = $MAX_RESTART_DELAY
+    auto restart delay = PT${MAX_RESTART_DELAY}S
 "
 
 # Run suite.
@@ -72,7 +72,7 @@ ${BASE_GLOBALRC}
 [suite servers]
     run hosts = ${CYLC_TEST_HOST}
     condemned hosts = localhost
-    auto restart delay = 20
+    auto restart delay = PT20S
 "
 
 # Check stop-restart working.