[ARVADOS] updated: 1.1.3-331-g842c85c
Git user
git at public.curoverse.com
Thu Apr 5 10:38:31 EDT 2018
Summary of changes:
services/nodemanager/arvnodeman/daemon.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
via 842c85cde40da0aad5afd5be08821a3b831312f4 (commit)
from 5fd2ed9e93670007226a1772040a966fb9dd4d22 (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 842c85cde40da0aad5afd5be08821a3b831312f4
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date: Thu Apr 5 11:37:49 2018 -0300
12085: Unconditionally remove the idle time counter of paired missing nodes.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>
diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py
index 3147de3..1b9f1e7 100644
--- a/services/nodemanager/arvnodeman/daemon.py
+++ b/services/nodemanager/arvnodeman/daemon.py
@@ -215,15 +215,13 @@ class NodeManagerDaemonActor(actor_class):
if hasattr(record.cloud_node, "_nodemanager_recently_booted"):
self.cloud_nodes.add(record)
else:
- # Node disappeared from the cloud node list. Stop the monitor
- # actor if necessary and forget about the node.
+ # Node disappeared from the cloud node list. If it's paired,
+ # remove its idle time counter.
+ if record.arvados_node:
+ status.tracker.idle_out(record.arvados_node.get('hostname'))
+ # Stop the monitor actor if necessary and forget about the node.
if record.actor:
try:
- # If it's paired and idle, stop its idle time counter
- # before removing the monitor actor.
- if record.actor.get_state().get() == 'idle':
- status.tracker.idle_out(
- record.actor.arvados_node.get()['hostname'])
record.actor.stop()
except pykka.ActorDeadError:
pass
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list