// Dispatcher service for Crunch that runs containers locally.
import (
+ "context"
"flag"
- "git.curoverse.com/arvados.git/sdk/go/arvados"
- "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
- "git.curoverse.com/arvados.git/sdk/go/dispatch"
"log"
"os"
"os/exec"
+ "os/signal"
"sync"
+ "syscall"
"time"
+
+ "git.curoverse.com/arvados.git/sdk/go/arvados"
+ "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+ "git.curoverse.com/arvados.git/sdk/go/dispatch"
)
func main() {
arv.Retries = 25
dispatcher := dispatch.Dispatcher{
- Arv: arv,
- RunContainer: run,
- PollInterval: time.Duration(*pollInterval) * time.Second,
- DoneProcessing: make(chan struct{})}
+ Arv: arv,
+ RunContainer: run,
+ PollPeriod: time.Duration(*pollInterval) * time.Second,
+ }
- err = dispatcher.RunDispatcher()
+ ctx, cancel := context.WithCancel(context.Background())
+ err = dispatcher.Run(ctx)
if err != nil {
return err
}
+ c := make(chan os.Signal, 1)
+ signal.Notify(c, os.Interrupt, syscall.SIGTERM, syscall.SIGQUIT)
+ sig := <-c
+ log.Printf("Received %s, shutting down", sig)
+ signal.Stop(c)
+
+ cancel()
+
runningCmdsMutex.Lock()
// Finished dispatching; interrupt any crunch jobs that are still running
for _, cmd := range runningCmds {
// crunch-run terminates, mark the container as Cancelled.
func run(dispatcher *dispatch.Dispatcher,
container arvados.Container,
- status chan arvados.Container) {
+ status <-chan arvados.Container) {
uuid := container.UUID
if err != nil {
log.Printf("Error getting final container state: %v", err)
}
- if container.LockedByUUID == dispatcher.Auth.UUID &&
- (container.State == dispatch.Locked || container.State == dispatch.Running) {
+ if container.State == dispatch.Locked || container.State == dispatch.Running {
log.Printf("After %s process termination, container state for %v is %q. Updating it to %q",
*crunchRunCommand, container.State, uuid, dispatch.Cancelled)
dispatcher.UpdateState(uuid, dispatch.Cancelled)