X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/62dff431b7fbe97479cf98ac38e529388e16494f..a78a5994fcbe41e1903a93f334d5a75e6e58db04:/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 bc1b0a5228..0bf30dad9f 100644 --- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go +++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go @@ -1,16 +1,19 @@ package main +// Dispatcher service for Crunch that submits containers to the slurm queue. + import ( "flag" "fmt" + "git.curoverse.com/arvados.git/sdk/go/arvados" "git.curoverse.com/arvados.git/sdk/go/arvadosclient" + "git.curoverse.com/arvados.git/sdk/go/dispatch" "io/ioutil" "log" + "math" "os" "os/exec" - "os/signal" - "sync" - "syscall" + "strings" "time" ) @@ -22,12 +25,8 @@ func main() { } var ( - arv arvadosclient.ArvadosClient - runningCmds map[string]*exec.Cmd - runningCmdsMutex sync.Mutex - waitGroup sync.WaitGroup - doneProcessing chan bool - sigChan chan os.Signal + crunchRunCommand *string + squeueUpdater Squeue ) func doMain() error { @@ -38,135 +37,77 @@ func doMain() error { 10, "Interval in seconds to poll for queued containers") - priorityPollInterval := flags.Int( - "container-priority-poll-interval", - 60, - "Interval in seconds to check priority of a dispatched container") - - crunchRunCommand := flags.String( + crunchRunCommand = flags.String( "crunch-run-command", "/usr/bin/crunch-run", "Crunch command to run container") - finishCommand := flags.String( - "finish-command", - "/usr/bin/crunch-finish-slurm.sh", - "Command to run from strigger when job is finished") - // Parse args; omit the first arg which is the command name flags.Parse(os.Args[1:]) - var err error - arv, err = arvadosclient.MakeArvadosClient() + arv, err := arvadosclient.MakeArvadosClient() if err != nil { + log.Printf("Error making Arvados client: %v", err) return err } + arv.Retries = 25 - // Channel to terminate - doneProcessing = make(chan bool) - - // Graceful shutdown - sigChan = make(chan os.Signal, 1) - signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT) - go func(sig <-chan os.Signal) { - for sig := range sig { - log.Printf("Caught signal: %v", sig) - doneProcessing <- true - } - }(sigChan) - - // Run all queued containers - runQueuedContainers(*pollInterval, *priorityPollInterval, *crunchRunCommand, *finishCommand) - - // Wait for all running crunch jobs to complete / terminate - waitGroup.Wait() - - return nil -} - -// Poll for queued containers using pollInterval. -// Invoke dispatchSlurm for each ticker cycle, which will run all the queued containers. -// -// Any errors encountered are logged but the program would continue to run (not exit). -// This is because, once one or more crunch jobs are running, -// we would need to wait for them complete. -func runQueuedContainers(pollInterval, priorityPollInterval int, crunchRunCommand, finishCommand string) { - ticker := time.NewTicker(time.Duration(pollInterval) * time.Second) - - for { - select { - case <-ticker.C: - dispatchSlurm(priorityPollInterval, crunchRunCommand, finishCommand) - case <-doneProcessing: - ticker.Stop() - return - } - } -} - -// Container data -type Container struct { - UUID string `json:"uuid"` - State string `json:"state"` - Priority int `json:"priority"` -} - -// ContainerList is a list of the containers from api -type ContainerList struct { - Items []Container `json:"items"` -} + squeueUpdater.StartMonitor(time.Duration(*pollInterval) * time.Second) + defer squeueUpdater.Done() -// Get the list of queued containers from API server and invoke run for each container. -func dispatchSlurm(priorityPollInterval int, crunchRunCommand, finishCommand string) { - params := arvadosclient.Dict{ - "filters": [][]string{[]string{"state", "=", "Queued"}}, - } + dispatcher := dispatch.Dispatcher{ + Arv: arv, + RunContainer: run, + PollInterval: time.Duration(*pollInterval) * time.Second, + DoneProcessing: make(chan struct{})} - var containers ContainerList - err := arv.List("containers", params, &containers) + err = dispatcher.RunDispatcher() if err != nil { - log.Printf("Error getting list of queued containers: %q", err) - return + return err } - for i := 0; i < len(containers.Items); i++ { - log.Printf("About to submit queued container %v", containers.Items[i].UUID) - // Run the container - go run(containers.Items[i], crunchRunCommand, finishCommand, priorityPollInterval) - } + return nil } // sbatchCmd -var sbatchCmd = func(uuid string) *exec.Cmd { - return exec.Command("sbatch", "--job-name="+uuid, "--share", "--parsable") +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)) } -// striggerCmd -var striggerCmd = func(jobid, containerUUID, finishCommand, apiHost, apiToken, apiInsecure string) *exec.Cmd { - return exec.Command("strigger", "--set", "--jobid="+jobid, "--fini", - fmt.Sprintf("--program=%s %s %s %s %s", finishCommand, apiHost, apiToken, apiInsecure, containerUUID)) +// scancelCmd +func scancelFunc(container arvados.Container) *exec.Cmd { + return exec.Command("scancel", "--name="+container.UUID) } -// Submit job to slurm using sbatch. -func submit(container Container, crunchRunCommand string) (jobid string, submitErr error) { - submitErr = nil +// Wrap these so that they can be overridden by tests +var sbatchCmd = sbatchFunc +var scancelCmd = scancelFunc - // Mark record as complete if anything errors out. +// Submit job to slurm using sbatch. +func submit(dispatcher *dispatch.Dispatcher, + container arvados.Container, crunchRunCommand string) (submitErr error) { defer func() { - if submitErr != nil { - // This really should be an "Error" state, see #8018 - updateErr := arv.Update("containers", container.UUID, - arvadosclient.Dict{ - "container": arvadosclient.Dict{"state": "Complete"}}, - nil) - if updateErr != nil { - log.Printf("Error updating container state to 'Complete' for %v: %q", container.UUID, updateErr) - } + // If we didn't get as far as submitting a slurm job, + // unlock the container and return it to the queue. + if submitErr == nil { + // OK, no cleanup needed + return + } + err := dispatcher.Arv.Update("containers", container.UUID, + arvadosclient.Dict{ + "container": arvadosclient.Dict{"state": "Queued"}}, + nil) + if err != nil { + log.Printf("Error unlocking container %s: %v", container.UUID, err) } }() // Create the command and attach to stdin/stdout - cmd := sbatchCmd(container.UUID) + cmd := sbatchCmd(container) stdinWriter, stdinerr := cmd.StdinPipe() if stdinerr != nil { submitErr = fmt.Errorf("Error creating stdin pipe %v: %q", container.UUID, stdinerr) @@ -185,6 +126,10 @@ func submit(container Container, crunchRunCommand string) (jobid string, submitE return } + // Mutex between squeue sync and running sbatch or scancel. + squeueUpdater.SlurmLock.Lock() + defer squeueUpdater.SlurmLock.Unlock() + err := cmd.Start() if err != nil { submitErr = fmt.Errorf("Error starting %v: %v", cmd.Args, err) @@ -194,15 +139,15 @@ func submit(container Container, crunchRunCommand string) (jobid string, submitE stdoutChan := make(chan []byte) go func() { b, _ := ioutil.ReadAll(stdoutReader) + stdoutReader.Close() stdoutChan <- b - close(stdoutChan) }() stderrChan := make(chan []byte) go func() { b, _ := ioutil.ReadAll(stderrReader) + stderrReader.Close() stderrChan <- b - close(stderrChan) }() // Send a tiny script on stdin to execute the crunch-run command @@ -215,82 +160,110 @@ func submit(container Container, crunchRunCommand string) (jobid string, submitE stdoutMsg := <-stdoutChan stderrmsg := <-stderrChan + close(stdoutChan) + close(stderrChan) + if err != nil { submitErr = fmt.Errorf("Container submission failed %v: %v %v", cmd.Args, err, stderrmsg) return } - // If everything worked out, got the jobid on stdout - jobid = string(stdoutMsg) - + log.Printf("sbatch succeeded: %s", strings.TrimSpace(string(stdoutMsg))) return } -// finalizeRecordOnFinish uses 'strigger' command to register a script that will run on -// the slurm controller when the job finishes. -func finalizeRecordOnFinish(jobid, containerUUID, finishCommand, apiHost, apiToken, apiInsecure string) { - cmd := striggerCmd(jobid, containerUUID, finishCommand, apiHost, apiToken, apiInsecure) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - err := cmd.Run() - if err != nil { - log.Printf("While setting up strigger: %v", err) - } -} - -// Run a queued container. -// Set container state to locked (TBD) -// Submit job to slurm to execute crunch-run command for the container -// If the container priority becomes zero while crunch job is still running, cancel the job. -func run(container Container, crunchRunCommand, finishCommand string, priorityPollInterval int) { +// If the container is marked as Locked, check if it is already in the slurm +// queue. If not, submit it. +// +// If the container is marked as Running, check if it is in the slurm queue. +// If not, mark it as Cancelled. +func monitorSubmitOrCancel(dispatcher *dispatch.Dispatcher, container arvados.Container, monitorDone *bool) { + submitted := false + for !*monitorDone { + if squeueUpdater.CheckSqueue(container.UUID) { + // Found in the queue, so continue monitoring + submitted = true + } else if container.State == dispatch.Locked && !submitted { + // Not in queue but in Locked state and we haven't + // submitted it yet, so submit it. + + log.Printf("About to submit queued container %v", container.UUID) + + if err := submit(dispatcher, container, *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) + } + submitted = true + } else { + // Not in queue and we are not going to submit it. + // Refresh the container state. If it is + // Complete/Cancelled, do nothing, if it is Locked then + // release it back to the Queue, if it is Running then + // clean up the record. + + var con arvados.Container + err := dispatcher.Arv.Get("containers", container.UUID, nil, &con) + if err != nil { + log.Printf("Error getting final container state: %v", err) + } - jobid, err := submit(container, crunchRunCommand) - if err != nil { - log.Printf("Error queuing container run: %v", err) - return - } + var st arvados.ContainerState + switch con.State { + case dispatch.Locked: + st = dispatch.Queued + case dispatch.Running: + st = dispatch.Cancelled + default: + // Container state is Queued, Complete or Cancelled so stop monitoring it. + return + } - insecure := "0" - if arv.ApiInsecure { - insecure = "1" - } - finalizeRecordOnFinish(jobid, container.UUID, finishCommand, arv.ApiServer, arv.ApiToken, insecure) - - // Update container status to Running, this is a temporary workaround - // to avoid resubmitting queued containers because record locking isn't - // implemented yet. - err = arv.Update("containers", container.UUID, - arvadosclient.Dict{ - "container": arvadosclient.Dict{"state": "Running"}}, - nil) - if err != nil { - log.Printf("Error updating container state to 'Running' for %v: %q", container.UUID, err) + 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) + } } +} - log.Printf("Submitted container run for %v", container.UUID) - - containerUUID := container.UUID - - // A goroutine to terminate the runner if container priority becomes zero - priorityTicker := time.NewTicker(time.Duration(priorityPollInterval) * time.Second) - go func() { - for _ = range priorityTicker.C { - var container Container - err := arv.Get("containers", containerUUID, nil, &container) - if err != nil { - log.Printf("Error getting container info for %v: %q", container.UUID, err) - } else { - if container.Priority == 0 { - log.Printf("Canceling container %v", container.UUID) - priorityTicker.Stop() - cancelcmd := exec.Command("scancel", "--name="+container.UUID) - cancelcmd.Run() - } - if container.State == "Complete" { - priorityTicker.Stop() +// Run or monitor a container. +// +// Monitor status updates. If the priority changes to zero, cancel the +// container using scancel. +func run(dispatcher *dispatch.Dispatcher, + container arvados.Container, + status chan arvados.Container) { + + log.Printf("Monitoring container %v started", container.UUID) + defer log.Printf("Monitoring container %v finished", container.UUID) + + monitorDone := false + go monitorSubmitOrCancel(dispatcher, container, &monitorDone) + + for container = range status { + if container.State == dispatch.Locked || container.State == dispatch.Running { + if container.Priority == 0 { + log.Printf("Canceling container %s", container.UUID) + + // Mutex between squeue sync and running sbatch or scancel. + squeueUpdater.SlurmLock.Lock() + err := scancelCmd(container).Run() + squeueUpdater.SlurmLock.Unlock() + + if err != nil { + log.Printf("Error stopping container %s with scancel: %v", + container.UUID, err) + if squeueUpdater.CheckSqueue(container.UUID) { + log.Printf("Container %s is still in squeue after scancel.", + container.UUID) + continue + } } + + err = dispatcher.UpdateState(container.UUID, dispatch.Cancelled) } } - }() - + } + monitorDone = true }