projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4363: Explicit UTF-8 for test string.
[arvados.git]
/
services
/
nodemanager
/
arvnodeman
/
config.py
diff --git
a/services/nodemanager/arvnodeman/config.py
b/services/nodemanager/arvnodeman/config.py
index 07504e2fe9aa9e0007044881c57c1ad6793426d0..754b9319f0797d864ab0c9eb50107054485e6eed 100644
(file)
--- a/
services/nodemanager/arvnodeman/config.py
+++ b/
services/nodemanager/arvnodeman/config.py
@@
-7,11
+7,11
@@
import importlib
import logging
import ssl
import logging
import ssl
-import apiclient.errors as apierror
import arvados
import httplib2
import libcloud.common.types as cloud_types
import pykka
import arvados
import httplib2
import libcloud.common.types as cloud_types
import pykka
+from apiclient import errors as apierror
# IOError is the base class for socket.error and friends.
# It seems like it hits the sweet spot for operations we want to retry:
# IOError is the base class for socket.error and friends.
# It seems like it hits the sweet spot for operations we want to retry:
@@
-37,7
+37,8
@@
class NodeManagerConfig(ConfigParser.SafeConfigParser):
for sec_name, settings in {
'Arvados': {'insecure': 'no',
'timeout': '15'},
for sec_name, settings in {
'Arvados': {'insecure': 'no',
'timeout': '15'},
- 'Daemon': {'max_nodes': '1',
+ 'Daemon': {'min_nodes': '0',
+ 'max_nodes': '1',
'poll_time': '60',
'max_poll_time': '300',
'poll_stale_after': '600',
'poll_time': '60',
'max_poll_time': '300',
'poll_stale_after': '600',