[ARVADOS] created: 5b9ae3a5ef489374783c039e128c985b3eda2067

[git at public.curoverse.com]

        at  5b9ae3a5ef489374783c039e128c985b3eda2067 (commit)


commit 5b9ae3a5ef489374783c039e128c985b3eda2067
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Sep 10 13:27:34 2015 -0400

    7031: Node manager can also shut down nodes that are in 'down' state

diff --git a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py
index 6d5c223..6e7d89b 100644
--- a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py
+++ b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py
@@ -327,7 +327,7 @@ class ComputeNodeMonitorActor(config.actor_class):
             return timestamp_fresh(self.cloud_node_start_time,
                                    self.node_stale_after)
         else:
-            return self.in_state('idle')
+            return self.in_state('idle', 'down')
 
     def consider_shutdown(self):
         next_opening = self._shutdowns.next_opening()

commit afa272bc4c4ef4de2c55b64458d3db938d5fd794
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Sep 10 13:11:56 2015 -0400

    7031: Add drain* to list of slurm states that indicate a node is a candidate
    for shutdown.

diff --git a/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py b/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py
index 71e73f1..839c029 100644
--- a/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py
+++ b/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py
@@ -10,7 +10,7 @@ from . import \
 from . import ComputeNodeShutdownActor as ShutdownActorBase
 
 class ComputeNodeShutdownActor(ShutdownActorBase):
-    SLURM_END_STATES = frozenset(['down\n', 'down*\n', 'drain\n', 'fail\n'])
+    SLURM_END_STATES = frozenset(['down\n', 'down*\n', 'drain\n', 'drain*\n', 'fail\n'])
 
     def on_start(self):
         arv_node = self._arvados_node()

-----------------------------------------------------------------------


hooks/post-receive
--