X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f5ef76001884b7b464574c51783efc352f5e7532..f87d258ccb34ac92d3c0d1ceb080f5783dab1881:/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go index 09e3d591a8..84105e1fc7 100644 --- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go +++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go @@ -7,7 +7,6 @@ package main // Dispatcher service for Crunch that submits containers to the slurm queue. import ( - "bytes" "context" "flag" "fmt" @@ -18,12 +17,14 @@ import ( "strings" "time" - "git.curoverse.com/arvados.git/lib/config" - "git.curoverse.com/arvados.git/lib/dispatchcloud" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/arvadosclient" - "git.curoverse.com/arvados.git/sdk/go/dispatch" + "git.arvados.org/arvados.git/lib/cmd" + "git.arvados.org/arvados.git/lib/config" + "git.arvados.org/arvados.git/lib/dispatchcloud" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvadosclient" + "git.arvados.org/arvados.git/sdk/go/dispatch" "github.com/coreos/go-systemd/daemon" + "github.com/ghodss/yaml" "github.com/sirupsen/logrus" ) @@ -35,8 +36,7 @@ type logger interface { const initialNiceValue int64 = 10000 var ( - version = "dev" - defaultConfigPath = "/etc/arvados/crunch-dispatch-slurm/crunch-dispatch-slurm.yml" + version = "dev" ) type Dispatcher struct { @@ -74,16 +74,15 @@ func (disp *Dispatcher) Run(prog string, args []string) error { // configure() loads config files. Tests skip this. func (disp *Dispatcher) configure(prog string, args []string) error { - flags := flag.NewFlagSet(prog, flag.ExitOnError) + if disp.logger == nil { + disp.logger = logrus.StandardLogger() + } + flags := flag.NewFlagSet(prog, flag.ContinueOnError) flags.Usage = func() { usage(flags) } - loader := config.NewLoader(stdin, log) + loader := config.NewLoader(nil, disp.logger) loader.SetupFlags(flags) - configPath := flags.String( - "config", - defaultConfigPath, - "`path` to JSON or YAML configuration file") dumpConfig := flag.Bool( "dump-config", false, @@ -93,13 +92,9 @@ func (disp *Dispatcher) configure(prog string, args []string) error { false, "Print version information and exit.") - args = loader.MungeLegacyConfigArgs(logrus.StandardLogger(), args, "-crunch-dispatch-slurm-config") - - // Parse args; omit the first arg which is the command name - flags.Parse(args) - - if err == flag.ErrHelp { - return nil + args = loader.MungeLegacyConfigArgs(disp.logger, args, "-legacy-crunch-dispatch-slurm-config") + if ok, code := cmd.ParseFlags(flags, prog, args, "", os.Stderr); !ok { + os.Exit(code) } // Print version information if requested @@ -119,8 +114,9 @@ func (disp *Dispatcher) configure(prog string, args []string) error { return fmt.Errorf("config error: %s", err) } - disp.Client.APIHost = fmt.Sprintf("%s:%d", disp.cluster.Services.Controller.ExternalURL.Host, - disp.cluster.Services.Controller.ExternalURL.Port) + disp.logger = disp.logger.WithField("ClusterID", disp.cluster.ClusterID) + + disp.Client.APIHost = disp.cluster.Services.Controller.ExternalURL.Host disp.Client.AuthToken = disp.cluster.SystemRootToken disp.Client.Insecure = disp.cluster.TLS.Insecure @@ -134,14 +130,23 @@ func (disp *Dispatcher) configure(prog string, args []string) error { if disp.Client.Insecure { os.Setenv("ARVADOS_API_HOST_INSECURE", "1") } - os.Setenv("ARVADOS_KEEP_SERVICES", strings.Join(disp.Client.KeepServiceURIs, " ")) os.Setenv("ARVADOS_EXTERNAL_CLIENT", "") + for k, v := range disp.cluster.Containers.SLURM.SbatchEnvironmentVariables { + os.Setenv(k, v) + } } else { disp.logger.Warnf("Client credentials missing from config, so falling back on environment variables (deprecated).") } if *dumpConfig { - return config.DumpAndExit(cfg) + out, err := yaml.Marshal(cfg) + if err != nil { + return err + } + _, err = os.Stdout.Write(out) + if err != nil { + return err + } } return nil @@ -149,9 +154,6 @@ func (disp *Dispatcher) configure(prog string, args []string) error { // setup() initializes private fields after configure(). func (disp *Dispatcher) setup() { - if disp.logger == nil { - disp.logger = logrus.StandardLogger() - } arv, err := arvadosclient.MakeArvadosClient() if err != nil { disp.logger.Fatalf("Error making Arvados client: %v", err) @@ -161,17 +163,17 @@ func (disp *Dispatcher) setup() { disp.slurm = NewSlurmCLI() disp.sqCheck = &SqueueChecker{ Logger: disp.logger, - Period: time.Duration(disp.PollPeriod), - PrioritySpread: disp.PrioritySpread, + Period: time.Duration(disp.cluster.Containers.CloudVMs.PollInterval), + PrioritySpread: disp.cluster.Containers.SLURM.PrioritySpread, Slurm: disp.slurm, } disp.Dispatcher = &dispatch.Dispatcher{ Arv: arv, Logger: disp.logger, - BatchSize: disp.BatchSize, + BatchSize: disp.cluster.API.MaxItemsPerResponse, RunContainer: disp.runContainer, - PollPeriod: time.Duration(disp.PollPeriod), - MinRetryPeriod: time.Duration(disp.MinRetryPeriod), + PollPeriod: time.Duration(disp.cluster.Containers.CloudVMs.PollInterval), + MinRetryPeriod: time.Duration(disp.cluster.Containers.MinRetryPeriod), } } @@ -198,7 +200,7 @@ var containerUuidPattern = regexp.MustCompile(`^[a-z0-9]{5}-dz642-[a-z0-9]{15}$` // Cancelled or Complete. See https://dev.arvados.org/issues/10979 func (disp *Dispatcher) checkSqueueForOrphans() { for _, uuid := range disp.sqCheck.All() { - if !containerUuidPattern.MatchString(uuid) { + if !containerUuidPattern.MatchString(uuid) || !strings.HasPrefix(uuid, disp.cluster.ClusterID) { continue } err := disp.TrackContainer(uuid) @@ -209,7 +211,9 @@ func (disp *Dispatcher) checkSqueueForOrphans() { } func (disp *Dispatcher) slurmConstraintArgs(container arvados.Container) []string { - mem := int64(math.Ceil(float64(container.RuntimeConstraints.RAM+container.RuntimeConstraints.KeepCacheRAM+disp.ReserveExtraRAM) / float64(1048576))) + mem := int64(math.Ceil(float64(container.RuntimeConstraints.RAM+ + container.RuntimeConstraints.KeepCacheRAM+ + int64(disp.cluster.Containers.ReserveExtraRAM)) / float64(1048576))) disk := dispatchcloud.EstimateScratchSpace(&container) disk = int64(math.Ceil(float64(disk) / float64(1048576))) @@ -222,7 +226,7 @@ func (disp *Dispatcher) slurmConstraintArgs(container arvados.Container) []strin func (disp *Dispatcher) sbatchArgs(container arvados.Container) ([]string, error) { var args []string - args = append(args, disp.SbatchArguments...) + args = append(args, disp.cluster.Containers.SLURM.SbatchArgumentsList...) args = append(args, "--job-name="+container.UUID, fmt.Sprintf("--nice=%d", initialNiceValue), "--no-requeue") if disp.cluster == nil { @@ -249,6 +253,7 @@ func (disp *Dispatcher) submit(container arvados.Container, crunchRunCommand []s // append() here avoids modifying crunchRunCommand's // underlying array, which is shared with other goroutines. crArgs := append([]string(nil), crunchRunCommand...) + crArgs = append(crArgs, "--runtime-engine="+disp.cluster.Containers.RuntimeEngine) crArgs = append(crArgs, container.UUID) crScript := strings.NewReader(execScript(crArgs)) @@ -264,43 +269,17 @@ func (disp *Dispatcher) submit(container arvados.Container, crunchRunCommand []s // already in the queue). Cancel the slurm job if the container's // priority changes to zero or its state indicates it's no longer // running. -func (disp *Dispatcher) runContainer(_ *dispatch.Dispatcher, ctr arvados.Container, status <-chan arvados.Container) { +func (disp *Dispatcher) runContainer(_ *dispatch.Dispatcher, ctr arvados.Container, status <-chan arvados.Container) error { ctx, cancel := context.WithCancel(context.Background()) defer cancel() if ctr.State == dispatch.Locked && !disp.sqCheck.HasUUID(ctr.UUID) { log.Printf("Submitting container %s to slurm", ctr.UUID) - if err := disp.submit(ctr, disp.CrunchRunCommand); err != nil { - var text string - if err, ok := err.(dispatchcloud.ConstraintsNotSatisfiableError); ok { - var logBuf bytes.Buffer - fmt.Fprintf(&logBuf, "cannot run container %s: %s\n", ctr.UUID, err) - if len(err.AvailableTypes) == 0 { - fmt.Fprint(&logBuf, "No instance types are configured.\n") - } else { - fmt.Fprint(&logBuf, "Available instance types:\n") - for _, t := range err.AvailableTypes { - fmt.Fprintf(&logBuf, - "Type %q: %d VCPUs, %d RAM, %d Scratch, %f Price\n", - t.Name, t.VCPUs, t.RAM, t.Scratch, t.Price, - ) - } - } - text = logBuf.String() - disp.UpdateState(ctr.UUID, dispatch.Cancelled) - } else { - text = fmt.Sprintf("Error submitting container %s to slurm: %s", ctr.UUID, err) - } - log.Print(text) - - lr := arvadosclient.Dict{"log": arvadosclient.Dict{ - "object_uuid": ctr.UUID, - "event_type": "dispatch", - "properties": map[string]string{"text": text}}} - disp.Arv.Create("logs", lr, nil) - - disp.Unlock(ctr.UUID) - return + cmd := []string{disp.cluster.Containers.CrunchRunCommand} + cmd = append(cmd, disp.cluster.Containers.CrunchRunArgumentsList...) + err := disp.submit(ctr, cmd) + if err != nil { + return err } } @@ -329,7 +308,7 @@ func (disp *Dispatcher) runContainer(_ *dispatch.Dispatcher, ctr arvados.Contain case dispatch.Locked: disp.Unlock(ctr.UUID) } - return + return nil case updated, ok := <-status: if !ok { log.Printf("container %s is done: cancel slurm job", ctr.UUID) @@ -361,12 +340,3 @@ func (disp *Dispatcher) scancel(ctr arvados.Container) { time.Sleep(time.Second) } } - -func (disp *Dispatcher) readConfig(path string) error { - err := config.LoadFile(disp, path) - if err != nil && os.IsNotExist(err) && path == defaultConfigPath { - log.Printf("Config not specified. Continue with default configuration.") - err = nil - } - return err -}