[ARVADOS] updated: 993d923b3c6310bffb71e2ab50c0cb2833408b08

[git at public.curoverse.com]

Summary of changes:
 services/crunch-dispatch-local/crunch-dispatch-local.go | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

       via  993d923b3c6310bffb71e2ab50c0cb2833408b08 (commit)
      from  78c3676de22b2795701d3e36e734ccb081157086 (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 993d923b3c6310bffb71e2ab50c0cb2833408b08
Author: radhika <radhika at curoverse.com>
Date:   Wed Jan 20 12:05:59 2016 -0500

    8028: In runningCmds loop, no need to wait for process termination.

diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.go b/services/crunch-dispatch-local/crunch-dispatch-local.go
index 47c3564..0255831 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local.go
@@ -75,13 +75,8 @@ func doMain() error {
 	runQueuedContainers(*pollInterval, *priorityPollInterval, *crunchRunCommand)
 
 	// Finished dispatching; interrupt any crunch jobs that are still running
-	for uuid, cmd := range runningCmds {
-		go func(uuid string) {
-			cmd.Process.Signal(os.Interrupt)
-			if _, err := cmd.Process.Wait(); err != nil {
-				log.Printf("Error while waiting for crunch job to finish for %v: %q", uuid, err)
-			}
-		}(uuid)
+	for _, cmd := range runningCmds {
+		cmd.Process.Signal(os.Interrupt)
 	}
 
 	// Wait for all running crunch jobs to complete / terminate
@@ -192,9 +187,6 @@ func run(uuid string, crunchRunCommand string, priorityPollInterval int) {
 					if container.Priority == 0 {
 						priorityTicker.Stop()
 						cmd.Process.Signal(os.Interrupt)
-						runningCmdsMutex.Lock()
-						delete(runningCmds, uuid)
-						runningCmdsMutex.Unlock()
 						return
 					}
 				}

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


hooks/post-receive
--