9135: Make EventClient initialization more consistent.

[arvados.git] / sdk / go / crunchrunner / crunchrunner.go

diff --git a/sdk/go/crunchrunner/crunchrunner.go b/sdk/go/crunchrunner/crunchrunner.go
index 02f2be4c6f0d9ab84d238e180bd5e34d4cb1a3bc..14c75afff282cbfd6fc389f0d81678cadb502260 100644 (file)
--- a/sdk/go/crunchrunner/crunchrunner.go
+++ b/sdk/go/crunchrunner/crunchrunner.go
@@ -1,10 +1,13 @@
 package main
 
 import (
+       "crypto/x509"
        "fmt"
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/keepclient"
+       "io/ioutil"
        "log"
+       "net/http"
        "os"
        "os/exec"
        "os/signal"
@@ -113,6 +116,8 @@ func setupCommand(cmd *exec.Cmd, taskp TaskDef, outdir string, replacements map[
                cmd.Stdout = os.Stdout
        }
 
+       cmd.Stderr = os.Stderr
+
        if taskp.Env != nil {
                // Set up subprocess environment
                cmd.Env = os.Environ()
@@ -124,9 +129,9 @@ func setupCommand(cmd *exec.Cmd, taskp TaskDef, outdir string, replacements map[
        return stdin, stdout, nil
 }
 
+// Set up signal handlers.  Go sends signal notifications to a "signal
+// channel".
 func setupSignals(cmd *exec.Cmd) chan os.Signal {
-       // Set up signal handlers
-       // Forward SIGINT, SIGTERM and SIGQUIT to inner process
        sigChan := make(chan os.Signal, 1)
        signal.Notify(sigChan, syscall.SIGTERM)
        signal.Notify(sigChan, syscall.SIGINT)
@@ -209,6 +214,10 @@ func runner(api IArvadosClient,
                "$(task.outdir)": outdir,
                "$(task.keep)":   keepmount}
 
+       log.Printf("crunchrunner: $(task.tmpdir)=%v", tmpdir)
+       log.Printf("crunchrunner: $(task.outdir)=%v", outdir)
+       log.Printf("crunchrunner: $(task.keep)=%v", keepmount)
+
        // Set up subprocess
        for k, v := range taskp.Command {
                taskp.Command[k] = substitute(v, replacements)
@@ -234,24 +243,28 @@ func runner(api IArvadosClient,
        log.Printf("Running %v%v%v", cmd.Args, stdin, stdout)
 
        var caughtSignal os.Signal
-       {
-               sigChan := setupSignals(cmd)
-               defer signal.Stop(sigChan)
+       sigChan := setupSignals(cmd)
 
-               err = cmd.Start()
-               if err != nil {
-                       return TempFail{err}
+       err = cmd.Start()
+       if err != nil {
+               signal.Stop(sigChan)
+               return TempFail{err}
+       }
+
+       finishedSignalNotify := make(chan struct{})
+       go func(sig <-chan os.Signal) {
+               for sig := range sig {
+                       caughtSignal = sig
+                       cmd.Process.Signal(caughtSignal)
                }
+               close(finishedSignalNotify)
+       }(sigChan)
 
-               go func(sig <-chan os.Signal) {
-                       for sig := range sig {
-                               caughtSignal = sig
-                               cmd.Process.Signal(caughtSignal)
-                       }
-               }(sigChan)
+       err = cmd.Wait()
+       signal.Stop(sigChan)
 
-               err = cmd.Wait()
-       }
+       close(sigChan)
+       <-finishedSignalNotify
 
        if caughtSignal != nil {
                log.Printf("Caught signal %v", caughtSignal)
@@ -313,6 +326,24 @@ func main() {
                log.Fatal(err)
        }
 
+       // Container may not have certificates installed, so need to look for
+       // /etc/arvados/ca-certificates.crt in addition to normal system certs.
+       var certFiles = []string{
+               "/etc/ssl/certs/ca-certificates.crt", // Debian
+               "/etc/pki/tls/certs/ca-bundle.crt",   // Red Hat
+               "/etc/arvados/ca-certificates.crt",
+       }
+
+       certs := x509.NewCertPool()
+       for _, file := range certFiles {
+               data, err := ioutil.ReadFile(file)
+               if err == nil {
+                       log.Printf("Using TLS certificates at %v", file)
+                       certs.AppendCertsFromPEM(data)
+               }
+       }
+       api.Client.Transport.(*http.Transport).TLSClientConfig.RootCAs = certs
+
        jobUuid := os.Getenv("JOB_UUID")
        taskUuid := os.Getenv("TASK_UUID")
        tmpdir := os.Getenv("TASK_WORK")