[ARVADOS] updated: dfdb6060ea1a6544fe2497d7c1d18078879fe090

[Git user]

Summary of changes:
 services/nodemanager/arvnodeman/computenode/dispatch/slurm.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

       via  dfdb6060ea1a6544fe2497d7c1d18078879fe090 (commit)
      from  17c23d338518f0498fb1396f24954f884a06b05b (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 dfdb6060ea1a6544fe2497d7c1d18078879fe090
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Apr 15 22:20:54 2016 -0400

    Don't try to drain node if no nodeename associated.  refs #8953

diff --git a/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py b/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py
index 170b32b..4a3e98a 100644
--- a/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py
+++ b/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py
@@ -53,9 +53,12 @@ class ComputeNodeShutdownActor(SlurmMixin, ShutdownActorBase):
     @RetryMixin._retry((subprocess.CalledProcessError,))
     def issue_slurm_drain(self):
         if self.cancel_reason is None:
-            self._set_node_state(self._nodename, 'DRAIN', 'Reason=Node Manager shutdown')
-            self._logger.info("Waiting for SLURM node %s to drain", self._nodename)
-            self._later.await_slurm_drain()
+            if self._nodename:
+                self._set_node_state(self._nodename, 'DRAIN', 'Reason=Node Manager shutdown')
+                self._logger.info("Waiting for SLURM node %s to drain", self._nodename)
+                self._later.await_slurm_drain()
+            else:
+                self._later.shutdown_node()
 
     @RetryMixin._retry((subprocess.CalledProcessError,))
     def await_slurm_drain(self):

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


hooks/post-receive
--