[ARVADOS] updated: 1.1.4-747-g4c393c35f

[Git user]

Summary of changes:
 services/nodemanager/arvnodeman/config.py   |  3 +++
 services/nodemanager/arvnodeman/launcher.py | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

       via  4c393c35f171c5b9e76972223a6c2739c02e0072 (commit)
       via  a464c2a216412032b58688194b4ff730fbe3a28f (commit)
       via  da14703fb4e1a249f47685b29310c4c69441ff08 (commit)
      from  562130229d7e85cbf813179a315772594e298127 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4c393c35f171c5b9e76972223a6c2739c02e0072
Merge: 562130229 a464c2a21
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Aug 3 14:31:13 2018 -0400

    Merge branch '13961-separate-polling' refs #13961
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit a464c2a216412032b58688194b4ff730fbe3a28f
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Aug 3 14:29:05 2018 -0400

    13961: Use poll_time as fallback
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/nodemanager/arvnodeman/launcher.py b/services/nodemanager/arvnodeman/launcher.py
index 53114b2b2..34ea9adb3 100644
--- a/services/nodemanager/arvnodeman/launcher.py
+++ b/services/nodemanager/arvnodeman/launcher.py
@@ -83,9 +83,9 @@ def launch_pollers(config, server_calculator):
     poll_time = config.getfloat('Daemon', 'poll_time')
     max_poll_time = config.getint('Daemon', 'max_poll_time')
 
-    cloudlist_poll_time = config.getfloat('Daemon', 'cloudlist_poll_time') or config.getfloat('Daemon', 'poll_time')
-    nodelist_poll_time = config.getfloat('Daemon', 'nodelist_poll_time') or config.getfloat('Daemon', 'poll_time')
-    wishlist_poll_time = config.getfloat('Daemon', 'wishlist_poll_time') or config.getfloat('Daemon', 'poll_time')
+    cloudlist_poll_time = config.getfloat('Daemon', 'cloudlist_poll_time') or poll_time
+    nodelist_poll_time = config.getfloat('Daemon', 'nodelist_poll_time') or poll_time
+    wishlist_poll_time = config.getfloat('Daemon', 'wishlist_poll_time') or poll_time
 
     timer = TimedCallBackActor.start(poll_time / 10.0).tell_proxy()
     cloud_node_poller = CloudNodeListMonitorActor.start(

-----------------------------------------------------------------------


hooks/post-receive
--