add nomad

diff --git a/services/boot/config.go b/services/boot/config.go
index 3ee981d4ee807df3ebd10a403af636c7e105e1f8..50e2850a1737821816b79bd6fda948b3d9ec5195 100644 (file)
--- a/services/boot/config.go
+++ b/services/boot/config.go
@@ -34,6 +34,9 @@ type portsConfig struct {
        ConsulSerfLAN int
        ConsulSerfWAN int
        ConsulServer  int
+       NomadHTTP     int
+       NomadRPC      int
+       NomadSerf     int
        VaultServer   int
 }
 
@@ -91,6 +94,9 @@ func DefaultConfig() *Config {
                        ConsulSerfLAN: 18301,
                        ConsulSerfWAN: 18302,
                        ConsulServer:  18300,
+                       NomadHTTP:     14646,
+                       NomadRPC:      14647,
+                       NomadSerf:     14648,
                        VaultServer:   18200,
                },
                DataDir:    "/var/lib/arvados",

diff --git a/services/boot/controller.go b/services/boot/controller.go
index 953507f820f875b2c0e2d07d07717bc14c280913..784f09f3f034b955c5dbd77938147803726c3206 100644 (file)
--- a/services/boot/controller.go
+++ b/services/boot/controller.go
@@ -24,7 +24,10 @@ func (c *controller) Boot(ctx context.Context) error {
                        },
                        consul,
                },
-               vault,
+               Concurrent{
+                       vault,
+                       nomad,
+               },
                Concurrent{
                        dispatchLocal,
                        dispatchSLURM,

diff --git a/services/boot/nomad.go b/services/boot/nomad.go
new file mode 100644 (file)
index 0000000..07c5de8
--- /dev/null
+++ b/services/boot/nomad.go
@@ -0,0 +1,99 @@
+package main
+
+import (
+       "context"
+       "fmt"
+       "os"
+       "path"
+       "sync"
+
+       "github.com/hashicorp/nomad/api"
+)
+
+var nomad = &nomadBooter{}
+
+type nomadBooter struct {
+       sync.Mutex
+}
+
+func (nb *nomadBooter) Boot(ctx context.Context) error {
+       nb.Lock()
+       defer nb.Unlock()
+
+       if nb.check(ctx) == nil {
+               return nil
+       }
+       cfg := cfg(ctx)
+       bin := cfg.UsrDir + "/bin/nomad"
+       err := (&download{
+               URL:  "https://releases.hashicorp.com/nomad/0.5.4/nomad_0.5.4_linux_amd64.zip",
+               Dest: bin,
+               //Size: 29079005,
+               Mode: 0755,
+       }).Boot(ctx)
+       if err != nil {
+               return err
+       }
+
+       dataDir := path.Join(cfg.DataDir, "nomad")
+       if err := os.MkdirAll(dataDir, 0700); err != nil {
+               return err
+       }
+
+       cf := path.Join(cfg.DataDir, "nomad.json")
+       err = atomicWriteJSON(cf, map[string]interface{}{
+               "client": map[string]interface{}{
+                       "enabled": true,
+                       "options": map[string]interface{}{
+                               "driver.raw_exec.enable": true,
+                       },
+               },
+               "consul": map[string]interface{}{
+                       "address": fmt.Sprintf("127.0.0.1:%d", cfg.Ports.ConsulHTTP),
+               },
+               "data_dir":   dataDir,
+               "datacenter": cfg.SiteID,
+               "ports": map[string]int{
+                       "http": cfg.Ports.NomadHTTP,
+                       "rpc":  cfg.Ports.NomadRPC,
+                       "serf": cfg.Ports.NomadSerf,
+               },
+               "server": map[string]interface{}{
+                       "enabled":          true,
+                       "bootstrap_expect": len(cfg.ControlHosts),
+               },
+       }, 0644)
+       if err != nil {
+               return err
+       }
+
+       supervisor := newSupervisor(ctx, "arvados-nomad", bin, "agent", "-config="+cf)
+       running, err := supervisor.Running(ctx)
+       if err != nil {
+               return err
+       }
+       if !running {
+               defer feedbackf(ctx, "starting nomad service")()
+               err = supervisor.Start(ctx)
+               if err != nil {
+                       return fmt.Errorf("starting nomad: %s", err)
+               }
+       }
+       return nb.check(ctx)
+}
+
+var nomadCfg = api.DefaultConfig()
+
+func (nb *nomadBooter) check(ctx context.Context) error {
+       cfg := cfg(ctx)
+       nomadCfg.Address = fmt.Sprintf("http://127.0.0.1:%d", cfg.Ports.NomadHTTP)
+       nomad, err := api.NewClient(nomadCfg)
+       if err != nil {
+               return err
+       }
+       _, err = nomad.Agent().Datacenter()
+       if err != nil {
+               return err
+       }
+       return nil
+}

diff --git a/services/boot/runit.go b/services/boot/runit.go
index ec906adefe61b6017a1fe86f7055c26aabf269e3..a47db32a77b512cfe21006e46246f4b7e57fb0e4 100644 (file)
--- a/services/boot/runit.go
+++ b/services/boot/runit.go
@@ -4,8 +4,6 @@ import (
        "bytes"
        "context"
        "fmt"
-       "io/ioutil"
-       "os"
        "path"
 )
 
@@ -20,7 +18,7 @@ func (r *runitService) Start(ctx context.Context) error {
                return err
        }
 
-       var script bytes.Buffer
+       script := &bytes.Buffer{}
        fmt.Fprintf(script, "#!/bin/sh\n\nexec %q", r.cmd)
        for _, arg := range r.args {
                fmt.Fprintf(script, " %q", arg)