15954: Eliminate intermediate go process.

[arvados.git] / lib / boot / cmd.go

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index 8d20e5f6c66792cb052873fe7d41404d524ec0b3..633dbdb0bd1a97d470fb1f85db91a20e916b334a 100644 (file)
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -179,8 +179,10 @@ func (boot *bootCommand) RunCommand(prog string, args []string, stdin io.Reader,
                {name: "health", goProg: "services/health"},
                {name: "keep-balance", goProg: "services/keep-balance", notIfTest: true},
                {name: "keepproxy", goProg: "services/keepproxy"},
+               {name: "keepstore", goProg: "services/keepstore", svc: boot.cluster.Services.Keepstore},
                {name: "keep-web", goProg: "services/keep-web"},
                {name: "railsAPI", svc: boot.cluster.Services.RailsAPI, railsApp: "services/api"},
+               {name: "ws", goProg: "services/ws"},
        } {
                cmpt := cmpt
                wg.Add(1)
@@ -202,8 +204,7 @@ func (boot *bootCommand) RunCommand(prog string, args []string, stdin io.Reader,
 func (boot *bootCommand) installGoProgram(ctx context.Context, srcpath string) error {
        boot.goMutex.Lock()
        defer boot.goMutex.Unlock()
-       env := append([]string{"GOPATH=" + boot.libPath}, os.Environ()...)
-       return boot.RunProgram(ctx, filepath.Join(boot.sourcePath, srcpath), nil, env, "go", "install")
+       return boot.RunProgram(ctx, filepath.Join(boot.sourcePath, srcpath), nil, []string{"GOPATH=" + boot.libPath}, "go", "install")
 }
 
 func (boot *bootCommand) setupRubyEnv() error {
@@ -236,7 +237,7 @@ func (boot *bootCommand) RunProgram(ctx context.Context, dir string, output io.W
                cmd.Dir = filepath.Join(boot.sourcePath, dir)
        }
        if env != nil {
-               cmd.Env = env
+               cmd.Env = append(env, os.Environ()...)
        }
        go func() {
                <-ctx.Done()
@@ -246,8 +247,9 @@ func (boot *bootCommand) RunProgram(ctx context.Context, dir string, output io.W
                                log.Infof("waiting for child process to start")
                                time.Sleep(time.Second)
                        } else {
+                               log.WithField("PID", cmd.Process.Pid).Info("sending SIGTERM")
                                cmd.Process.Signal(syscall.SIGTERM)
-                               log.WithField("PID", cmd.Process.Pid).Infof("waiting for child process to exit after SIGTERM")
+                               log.WithField("PID", cmd.Process.Pid).Info("waiting for child process to exit after SIGTERM")
                                time.Sleep(5 * time.Second)
                        }
                }
@@ -296,7 +298,28 @@ func (cmpt *component) Run(ctx context.Context, boot *bootCommand, stdout, stder
                }
        }
        if cmpt.goProg != "" {
-               return boot.RunProgram(ctx, cmpt.goProg, nil, nil, "go", "run", ".")
+               boot.RunProgram(ctx, cmpt.goProg, nil, nil, "go", "install")
+               if ctx.Err() != nil {
+                       return nil
+               }
+               _, basename := filepath.Split(cmpt.goProg)
+               if len(cmpt.svc.InternalURLs) > 0 {
+                       // Run one for each URL
+                       var wg sync.WaitGroup
+                       for u := range cmpt.svc.InternalURLs {
+                               u := u
+                               wg.Add(1)
+                               go func() {
+                                       defer wg.Done()
+                                       boot.RunProgram(ctx, boot.tempdir, nil, []string{"ARVADOS_SERVICE_INTERNAL_URL=" + u.String()}, basename)
+                               }()
+                       }
+                       wg.Wait()
+                       return nil
+               } else {
+                       // Just run one
+                       boot.RunProgram(ctx, boot.tempdir, nil, nil, basename)
+               }
        }
        if cmpt.runFunc != nil {
                return cmpt.runFunc(ctx, boot, stdout, stderr)
@@ -366,6 +389,9 @@ func (boot *bootCommand) autofillConfig(cfg *arvados.Config, log logrus.FieldLog
                &cluster.Services.WebDAVDownload,
                &cluster.Services.Websocket,
        } {
+               if svc == &cluster.Services.DispatchCloud && boot.clusterType == "test" {
+                       continue
+               }
                if len(svc.InternalURLs) == 0 {
                        port++
                        svc.InternalURLs = map[arvados.URL]arvados.ServiceInstance{
@@ -404,12 +430,29 @@ func (boot *bootCommand) autofillConfig(cfg *arvados.Config, log logrus.FieldLog
        if boot.clusterType != "production" {
                cluster.TLS.Insecure = true
        }
-       if boot.clusterType == "test" && len(cluster.Volumes) == 0 {
-               cluster.Volumes = map[string]arvados.Volume{
-                       "zzzzz-nyw5e-000000000000000": arvados.Volume{
-                               Driver:           "Directory",
-                               DriverParameters: json.RawMessage(fmt.Sprintf(`{"Root":%q}`, boot.tempdir+"/keep0")),
-                       },
+       if boot.clusterType == "test" {
+               port++
+               cluster.Services.Keepstore.InternalURLs[arvados.URL{Scheme: "http", Host: fmt.Sprintf("localhost:%d", port)}] = arvados.ServiceInstance{}
+
+               n := -1
+               for url := range cluster.Services.Keepstore.InternalURLs {
+                       n++
+                       datadir := fmt.Sprintf("%s/keep%d.data", boot.tempdir, n)
+                       if _, err = os.Stat(datadir + "/."); err == nil {
+                       } else if !os.IsNotExist(err) {
+                               return err
+                       } else if err = os.Mkdir(datadir, 0777); err != nil {
+                               return err
+                       }
+                       cluster.Volumes = map[string]arvados.Volume{
+                               fmt.Sprintf("zzzzz-nyw5e-%015d", n): arvados.Volume{
+                                       Driver:           "Directory",
+                                       DriverParameters: json.RawMessage(fmt.Sprintf(`{"Root":%q}`, datadir)),
+                                       AccessViaHosts: map[arvados.URL]arvados.VolumeAccess{
+                                               url: {},
+                                       },
+                               },
+                       }
                }
        }
        cfg.Clusters[cluster.ClusterID] = *cluster