[ARVADOS] updated: 8704a73054ecf639ac12cd4de4b1349ed69ae093

[Git user]

Summary of changes:
 services/nodemanager/arvnodeman/computenode/dispatch/slurm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  8704a73054ecf639ac12cd4de4b1349ed69ae093 (commit)
      from  da39f7ee464b4be805591ff5901bdacaa005b0a8 (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 8704a73054ecf639ac12cd4de4b1349ed69ae093
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Apr 15 15:50:06 2016 -0400

    8953: Don't start shutdown on 'drng*' or 'alloc*'.

diff --git a/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py b/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py
index b301451..170b32b 100644
--- a/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py
+++ b/services/nodemanager/arvnodeman/computenode/dispatch/slurm.py
@@ -60,7 +60,7 @@ class ComputeNodeShutdownActor(SlurmMixin, ShutdownActorBase):
     @RetryMixin._retry((subprocess.CalledProcessError,))
     def await_slurm_drain(self):
         output = self._get_slurm_state(self._nodename)
-        if output in ("drng\n", "alloc\n"):
+        if output in ("drng\n", "alloc\n", "drng*\n", "alloc*\n"):
             self._timer.schedule(time.time() + 10,
                                  self._later.await_slurm_drain)
         elif output in ("idle\n"):

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


hooks/post-receive
--