projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4233-graph-job-stats
[arvados.git]
/
services
/
nodemanager
/
arvnodeman
/
launcher.py
diff --git
a/services/nodemanager/arvnodeman/launcher.py
b/services/nodemanager/arvnodeman/launcher.py
index f4ad7163fa2ac0ef445d5feb8317f412e07401b4..9f5e1627eaa1b1d808c87190dc1c40c2c15f5d3b 100644
(file)
--- a/
services/nodemanager/arvnodeman/launcher.py
+++ b/
services/nodemanager/arvnodeman/launcher.py
@@
-12,9
+12,6
@@
import daemon
import pykka
from . import config as nmconfig
import pykka
from . import config as nmconfig
-from .computenode import \
- ComputeNodeSetupActor, ComputeNodeShutdownActor, ComputeNodeUpdateActor, \
- ShutdownTimer
from .daemon import NodeManagerDaemonActor
from .jobqueue import JobQueueMonitorActor, ServerCalculator
from .nodelist import ArvadosNodeListMonitorActor, CloudNodeListMonitorActor
from .daemon import NodeManagerDaemonActor
from .jobqueue import JobQueueMonitorActor, ServerCalculator
from .nodelist import ArvadosNodeListMonitorActor, CloudNodeListMonitorActor
@@
-109,10
+106,11
@@
def main(args=None):
signal.signal(sigcode, shutdown_signal)
setup_logging(config.get('Logging', 'file'), **config.log_levels())
signal.signal(sigcode, shutdown_signal)
setup_logging(config.get('Logging', 'file'), **config.log_levels())
+ node_setup, node_shutdown, node_update, node_monitor = \
+ config.dispatch_classes()
timer, cloud_node_poller, arvados_node_poller, job_queue_poller = \
launch_pollers(config)
timer, cloud_node_poller, arvados_node_poller, job_queue_poller = \
launch_pollers(config)
- cloud_node_updater = ComputeNodeUpdateActor.start(
- config.new_cloud_client).proxy()
+ cloud_node_updater = node_update.start(config.new_cloud_client).proxy()
node_daemon = NodeManagerDaemonActor.start(
job_queue_poller, arvados_node_poller, cloud_node_poller,
cloud_node_updater, timer,
node_daemon = NodeManagerDaemonActor.start(
job_queue_poller, arvados_node_poller, cloud_node_poller,
cloud_node_updater, timer,
@@
-121,7
+119,8
@@
def main(args=None):
config.getint('Daemon', 'min_nodes'),
config.getint('Daemon', 'max_nodes'),
config.getint('Daemon', 'poll_stale_after'),
config.getint('Daemon', 'min_nodes'),
config.getint('Daemon', 'max_nodes'),
config.getint('Daemon', 'poll_stale_after'),
- config.getint('Daemon', 'node_stale_after')).proxy()
+ config.getint('Daemon', 'node_stale_after'),
+ node_setup, node_shutdown, node_monitor).proxy()
signal.pause()
daemon_stopped = node_daemon.actor_ref.actor_stopped.is_set
signal.pause()
daemon_stopped = node_daemon.actor_ref.actor_stopped.is_set