X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c0eb54eaffd1dac69f4ea73742a69a2473669538..18de85806e3717421accb89b093fc2bd56822100:/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 0bf30dad9f..aaea51cbf7 100644 --- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go +++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go @@ -7,7 +7,10 @@ import ( "fmt" "git.curoverse.com/arvados.git/sdk/go/arvados" "git.curoverse.com/arvados.git/sdk/go/arvadosclient" + "git.curoverse.com/arvados.git/sdk/go/config" "git.curoverse.com/arvados.git/sdk/go/dispatch" + "github.com/coreos/go-systemd/daemon" + "io" "io/ioutil" "log" "math" @@ -17,34 +20,75 @@ import ( "time" ) +// Config used by crunch-dispatch-slurm +type Config struct { + Client arvados.Client + + SbatchArguments []string + PollPeriod arvados.Duration + + // crunch-run command to invoke. The container UUID will be + // appended. If nil, []string{"crunch-run"} will be used. + // + // Example: []string{"crunch-run", "--cgroup-parent-subsystem=memory"} + CrunchRunCommand []string +} + func main() { err := doMain() if err != nil { - log.Fatalf("%q", err) + log.Fatal(err) } } var ( - crunchRunCommand *string - squeueUpdater Squeue + theConfig Config + squeueUpdater Squeue ) +const defaultConfigPath = "/etc/arvados/crunch-dispatch-slurm/crunch-dispatch-slurm.yml" + func doMain() error { flags := flag.NewFlagSet("crunch-dispatch-slurm", flag.ExitOnError) + flags.Usage = func() { usage(flags) } - pollInterval := flags.Int( - "poll-interval", - 10, - "Interval in seconds to poll for queued containers") - - crunchRunCommand = flags.String( - "crunch-run-command", - "/usr/bin/crunch-run", - "Crunch command to run container") + configPath := flags.String( + "config", + defaultConfigPath, + "`path` to JSON or YAML configuration file") // Parse args; omit the first arg which is the command name flags.Parse(os.Args[1:]) + err := readConfig(&theConfig, *configPath) + if err != nil { + return err + } + + if theConfig.CrunchRunCommand == nil { + theConfig.CrunchRunCommand = []string{"crunch-run"} + } + + if theConfig.PollPeriod == 0 { + theConfig.PollPeriod = arvados.Duration(10 * time.Second) + } + + if theConfig.Client.APIHost != "" || theConfig.Client.AuthToken != "" { + // Copy real configs into env vars so [a] + // MakeArvadosClient() uses them, and [b] they get + // propagated to crunch-run via SLURM. + os.Setenv("ARVADOS_API_HOST", theConfig.Client.APIHost) + os.Setenv("ARVADOS_API_TOKEN", theConfig.Client.AuthToken) + os.Setenv("ARVADOS_API_INSECURE", "") + if theConfig.Client.Insecure { + os.Setenv("ARVADOS_API_INSECURE", "1") + } + os.Setenv("ARVADOS_KEEP_SERVICES", strings.Join(theConfig.Client.KeepServiceURIs, " ")) + os.Setenv("ARVADOS_EXTERNAL_CLIENT", "") + } else { + log.Printf("warning: Client credentials missing from config, so falling back on environment variables (deprecated).") + } + arv, err := arvadosclient.MakeArvadosClient() if err != nil { log.Printf("Error making Arvados client: %v", err) @@ -52,15 +96,19 @@ func doMain() error { } arv.Retries = 25 - squeueUpdater.StartMonitor(time.Duration(*pollInterval) * time.Second) + squeueUpdater.StartMonitor(time.Duration(theConfig.PollPeriod)) defer squeueUpdater.Done() dispatcher := dispatch.Dispatcher{ Arv: arv, RunContainer: run, - PollInterval: time.Duration(*pollInterval) * time.Second, + PollInterval: time.Duration(theConfig.PollPeriod), DoneProcessing: make(chan struct{})} + if _, err := daemon.SdNotify("READY=1"); err != nil { + log.Printf("Error notifying init daemon: %v", err) + } + err = dispatcher.RunDispatcher() if err != nil { return err @@ -72,10 +120,15 @@ func doMain() error { // sbatchCmd func sbatchFunc(container arvados.Container) *exec.Cmd { memPerCPU := math.Ceil(float64(container.RuntimeConstraints.RAM) / (float64(container.RuntimeConstraints.VCPUs) * 1048576)) - return exec.Command("sbatch", "--share", - fmt.Sprintf("--job-name=%s", container.UUID), - fmt.Sprintf("--mem-per-cpu=%d", int(memPerCPU)), - fmt.Sprintf("--cpus-per-task=%d", container.RuntimeConstraints.VCPUs)) + + var sbatchArgs []string + sbatchArgs = append(sbatchArgs, "--share") + sbatchArgs = append(sbatchArgs, theConfig.SbatchArguments...) + sbatchArgs = append(sbatchArgs, fmt.Sprintf("--job-name=%s", container.UUID)) + sbatchArgs = append(sbatchArgs, fmt.Sprintf("--mem-per-cpu=%d", int(memPerCPU))) + sbatchArgs = append(sbatchArgs, fmt.Sprintf("--cpus-per-task=%d", container.RuntimeConstraints.VCPUs)) + + return exec.Command("sbatch", sbatchArgs...) } // scancelCmd @@ -89,7 +142,7 @@ var scancelCmd = scancelFunc // Submit job to slurm using sbatch. func submit(dispatcher *dispatch.Dispatcher, - container arvados.Container, crunchRunCommand string) (submitErr error) { + container arvados.Container, crunchRunCommand []string) (submitErr error) { defer func() { // If we didn't get as far as submitting a slurm job, // unlock the container and return it to the queue. @@ -97,10 +150,7 @@ func submit(dispatcher *dispatch.Dispatcher, // OK, no cleanup needed return } - err := dispatcher.Arv.Update("containers", container.UUID, - arvadosclient.Dict{ - "container": arvadosclient.Dict{"state": "Queued"}}, - nil) + err := dispatcher.Unlock(container.UUID) if err != nil { log.Printf("Error unlocking container %s: %v", container.UUID, err) } @@ -152,7 +202,7 @@ func submit(dispatcher *dispatch.Dispatcher, // Send a tiny script on stdin to execute the crunch-run command // slurm actually enforces that this must be a #! script - fmt.Fprintf(stdinWriter, "#!/bin/sh\nexec '%s' '%s'\n", crunchRunCommand, container.UUID) + io.WriteString(stdinWriter, execScript(append(crunchRunCommand, container.UUID))) stdinWriter.Close() err = cmd.Wait() @@ -164,7 +214,7 @@ func submit(dispatcher *dispatch.Dispatcher, close(stderrChan) if err != nil { - submitErr = fmt.Errorf("Container submission failed %v: %v %v", cmd.Args, err, stderrmsg) + submitErr = fmt.Errorf("Container submission failed: %v: %v (stderr: %q)", cmd.Args, err, stderrmsg) return } @@ -189,11 +239,11 @@ func monitorSubmitOrCancel(dispatcher *dispatch.Dispatcher, container arvados.Co log.Printf("About to submit queued container %v", container.UUID) - if err := submit(dispatcher, container, *crunchRunCommand); err != nil { + if err := submit(dispatcher, container, theConfig.CrunchRunCommand); err != nil { log.Printf("Error submitting container %s to slurm: %v", container.UUID, err) // maybe sbatch is broken, put it back to queued - dispatcher.UpdateState(container.UUID, dispatch.Queued) + dispatcher.Unlock(container.UUID) } submitted = true } else { @@ -209,20 +259,20 @@ func monitorSubmitOrCancel(dispatcher *dispatch.Dispatcher, container arvados.Co log.Printf("Error getting final container state: %v", err) } - var st arvados.ContainerState switch con.State { case dispatch.Locked: - st = dispatch.Queued + log.Printf("Container %s in state %v but missing from slurm queue, changing to %v.", + container.UUID, con.State, dispatch.Queued) + dispatcher.Unlock(container.UUID) case dispatch.Running: - st = dispatch.Cancelled + st := dispatch.Cancelled + log.Printf("Container %s in state %v but missing from slurm queue, changing to %v.", + container.UUID, con.State, st) + dispatcher.UpdateState(container.UUID, st) default: // Container state is Queued, Complete or Cancelled so stop monitoring it. return } - - log.Printf("Container %s in state %v but missing from slurm queue, changing to %v.", - container.UUID, con.State, st) - dispatcher.UpdateState(container.UUID, st) } } } @@ -267,3 +317,12 @@ func run(dispatcher *dispatch.Dispatcher, } monitorDone = true } + +func readConfig(dst interface{}, path string) error { + err := config.LoadFile(dst, path) + if err != nil && os.IsNotExist(err) && path == defaultConfigPath { + log.Printf("Config not specified. Continue with default configuration.") + err = nil + } + return err +}