X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fe561d69b42d55191d6d1f01d4f3cdcf1fc9faaa..080c940d7a8134a6e277a53b7e45eb27e2b2c87f:/services/nodemanager/arvnodeman/config.py diff --git a/services/nodemanager/arvnodeman/config.py b/services/nodemanager/arvnodeman/config.py index f9724a8fcc..4fda7e76d6 100644 --- a/services/nodemanager/arvnodeman/config.py +++ b/services/nodemanager/arvnodeman/config.py @@ -57,7 +57,8 @@ class NodeManagerConfig(ConfigParser.SafeConfigParser): 'boot_fail_after': str(sys.maxint), 'node_stale_after': str(60 * 60 * 2), 'watchdog': '600', - 'node_mem_scaling': '0.95'}, + 'node_mem_scaling': '0.95', + 'consecutive_idle_count': '2'}, 'Manage': {'address': '127.0.0.1', 'port': '-1', 'ManagementToken': ''}, @@ -151,15 +152,15 @@ class NodeManagerConfig(ConfigParser.SafeConfigParser): section_types = { 'instance_type': str, 'price': float, - 'preemptable': bool, + 'preemptible': bool, } for sec_name in self.sections(): sec_words = sec_name.split(None, 2) if sec_words[0] != 'Size': continue size_spec = self.get_section(sec_name, section_types, int) - if 'preemptable' not in size_spec: - size_spec['preemptable'] = False + if 'preemptible' not in size_spec: + size_spec['preemptible'] = False if 'instance_type' not in size_spec: # Assume instance type is Size name if missing size_spec['instance_type'] = sec_words[1]