projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11121: Merge branch 'master' into 11121-crunch-output-collection-owner
[arvados.git]
/
services
/
nodemanager
/
arvnodeman
/
config.py
diff --git
a/services/nodemanager/arvnodeman/config.py
b/services/nodemanager/arvnodeman/config.py
index 315df1c3f984e29a0edfc09c71f76051def7480d..b54461c47d81b9f87bc1096da254cdf60e3f8aa9 100644
(file)
--- a/
services/nodemanager/arvnodeman/config.py
+++ b/
services/nodemanager/arvnodeman/config.py
@@
-5,7
+5,6
@@
from __future__ import absolute_import, print_function
import ConfigParser
import importlib
import logging
import ConfigParser
import importlib
import logging
-import ssl
import sys
import arvados
import sys
import arvados
@@
-13,13
+12,15
@@
import httplib2
import pykka
from apiclient import errors as apierror
import pykka
from apiclient import errors as apierror
-# IOError is the base class for socket.error and friends.
+from .baseactor import BaseNodeManagerActor
+
+# IOError is the base class for socket.error, ssl.SSLError, and friends.
# It seems like it hits the sweet spot for operations we want to retry:
# it's low-level, but unlikely to catch code bugs.
# It seems like it hits the sweet spot for operations we want to retry:
# it's low-level, but unlikely to catch code bugs.
-NETWORK_ERRORS = (IOError,
ssl.SSLError
)
+NETWORK_ERRORS = (IOError,)
ARVADOS_ERRORS = NETWORK_ERRORS + (apierror.Error,)
ARVADOS_ERRORS = NETWORK_ERRORS + (apierror.Error,)
-actor_class =
pykka.Threading
Actor
+actor_class =
BaseNodeManager
Actor
class NodeManagerConfig(ConfigParser.SafeConfigParser):
"""Node Manager Configuration class.
class NodeManagerConfig(ConfigParser.SafeConfigParser):
"""Node Manager Configuration class.
@@
-41,8
+42,10
@@
class NodeManagerConfig(ConfigParser.SafeConfigParser):
'poll_time': '60',
'max_poll_time': '300',
'poll_stale_after': '600',
'poll_time': '60',
'max_poll_time': '300',
'poll_stale_after': '600',
+ 'max_total_price': '0',
'boot_fail_after': str(sys.maxint),
'boot_fail_after': str(sys.maxint),
- 'node_stale_after': str(60 * 60 * 2)},
+ 'node_stale_after': str(60 * 60 * 2),
+ 'watchdog': '600'},
'Logging': {'file': '/dev/stderr',
'level': 'WARNING'},
}.iteritems():
'Logging': {'file': '/dev/stderr',
'level': 'WARNING'},
}.iteritems():
@@
-116,7
+119,10
@@
class NodeManagerConfig(ConfigParser.SafeConfigParser):
sec_words = sec_name.split(None, 2)
if sec_words[0] != 'Size':
continue
sec_words = sec_name.split(None, 2)
if sec_words[0] != 'Size':
continue
- size_kwargs[sec_words[1]] = self.get_section(sec_name, int)
+ size_spec = self.get_section(sec_name, int)
+ if 'price' in size_spec:
+ size_spec['price'] = float(size_spec['price'])
+ size_kwargs[sec_words[1]] = size_spec
# EC2 node sizes are identified by id. GCE sizes are identified by name.
matching_sizes = []
for size in all_sizes:
# EC2 node sizes are identified by id. GCE sizes are identified by name.
matching_sizes = []
for size in all_sizes: