[ARVADOS] updated: 62248e55fc084176bb42c19b45d968b068876feb

[git at public.curoverse.com]

Summary of changes:
 .../crunch-dispatch-local/crunch-dispatch-local.go | 24 ++++++++++++++++++++++
 .../crunch-dispatch-local_test.go                  | 10 ++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

       via  62248e55fc084176bb42c19b45d968b068876feb (commit)
      from  5385f033338aed928bc8c530e6f637056f76c474 (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 62248e55fc084176bb42c19b45d968b068876feb
Author: radhika <radhika at curoverse.com>
Date:   Tue Jan 19 21:40:59 2016 -0500

    8028: add signal handling to dispatcher.

diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.go b/services/crunch-dispatch-local/crunch-dispatch-local.go
index 2b7bd24..e575839 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local.go
@@ -6,6 +6,8 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"os/signal"
+	"syscall"
 	"time"
 )
 
@@ -17,6 +19,7 @@ func main() {
 }
 
 var arv arvadosclient.ArvadosClient
+var runningCmds map[string]*exec.Cmd
 
 func doMain() error {
 	flags := flag.NewFlagSet("crunch-dispatch-local", flag.ExitOnError)
@@ -45,6 +48,22 @@ func doMain() error {
 		return err
 	}
 
+	runningCmds = make(map[string]*exec.Cmd)
+	sigChan = make(chan os.Signal, 1)
+	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
+	go func(sig <-chan os.Signal) {
+		for sig := range sig {
+			doneProcessing <- true
+			caught := sig
+			for uuid, cmd := range runningCmds {
+				cmd.Process.Signal(caught)
+				if _, err := cmd.Process.Wait(); err != nil {
+					log.Printf("Error while waiting for process to finish for %v: %q", uuid, err)
+				}
+			}
+		}
+	}(sigChan)
+
 	// channel to terminate
 	doneProcessing = make(chan bool)
 
@@ -54,6 +73,7 @@ func doMain() error {
 }
 
 var doneProcessing chan bool
+var sigChan chan os.Signal
 
 // Poll for queued containers using pollInterval.
 // Invoke dispatchLocal for each ticker cycle, which will run all the queued containers.
@@ -122,6 +142,8 @@ func run(uuid string, crunchRunCommand string, priorityPollInterval int) {
 		return
 	}
 
+	runningCmds[uuid] = cmd
+
 	log.Printf("Started container run for %v", uuid)
 
 	err := arv.Update("containers", uuid,
@@ -146,6 +168,7 @@ func run(uuid string, crunchRunCommand string, priorityPollInterval int) {
 					if container.Priority == 0 {
 						priorityTicker.Stop()
 						cmd.Process.Signal(os.Interrupt)
+						delete(runningCmds, uuid)
 						return
 					}
 				}
@@ -157,6 +180,7 @@ func run(uuid string, crunchRunCommand string, priorityPollInterval int) {
 	if _, err := cmd.Process.Wait(); err != nil {
 		log.Printf("Error while waiting for process to finish for %v: %q", uuid, err)
 	}
+	delete(runningCmds, uuid)
 
 	priorityTicker.Stop()
 
diff --git a/services/crunch-dispatch-local/crunch-dispatch-local_test.go b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
index 997c63a..ef8cb83 100644
--- a/services/crunch-dispatch-local/crunch-dispatch-local_test.go
+++ b/services/crunch-dispatch-local/crunch-dispatch-local_test.go
@@ -10,6 +10,7 @@ import (
 	"net/http/httptest"
 	"os"
 	"strings"
+	"syscall"
 	"testing"
 	"time"
 
@@ -63,16 +64,13 @@ func (s *TestSuite) Test_doMain(c *C) {
 	os.Args = append(os.Args, args...)
 
 	go func() {
-		time.Sleep(2 * time.Second)
-		doneProcessing <- true
+		time.Sleep(5 * time.Second)
+		sigChan <- syscall.SIGINT
 	}()
 
 	err := doMain()
 	c.Check(err, IsNil)
 
-	// Give some time for run goroutine to complete
-	time.Sleep(1 * time.Second)
-
 	// There should be no queued containers now
 	params := arvadosclient.Dict{
 		"filters": [][]string{[]string{"state", "=", "Queued"}},
@@ -148,7 +146,7 @@ func testWithServerStub(c *C, apiStubResponses map[string]arvadostest.StubRespon
 
 	go func() {
 		time.Sleep(1 * time.Second)
-		doneProcessing <- true
+		sigChan <- syscall.SIGTERM
 	}()
 
 	runQueuedContainers(1, 1, crunchCmd)

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


hooks/post-receive
--