X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/646ea4328be842f4baa194205618c01910ec49db..be28c5f528a93ee32eef4c1dc2d0872cb718b29f:/lib/dispatchcloud/test/stub_driver.go diff --git a/lib/dispatchcloud/test/stub_driver.go b/lib/dispatchcloud/test/stub_driver.go index 5873e49221..f6e06d3f7c 100644 --- a/lib/dispatchcloud/test/stub_driver.go +++ b/lib/dispatchcloud/test/stub_driver.go @@ -17,8 +17,8 @@ import ( "sync" "time" - "git.curoverse.com/arvados.git/lib/cloud" - "git.curoverse.com/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/lib/cloud" + "git.arvados.org/arvados.git/sdk/go/arvados" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" ) @@ -34,6 +34,11 @@ type StubDriver struct { // VM's error rate and other behaviors. SetupVM func(*StubVM) + // Bugf, if set, is called if a bug is detected in the caller + // or stub. Typically set to (*check.C)Errorf. If unset, + // logger.Warnf is called instead. + Bugf func(string, ...interface{}) + // StubVM's fake crunch-run uses this Queue to read and update // container state. Queue *Queue @@ -56,7 +61,7 @@ type StubDriver struct { } // InstanceSet returns a new *StubInstanceSet. -func (sd *StubDriver) InstanceSet(params json.RawMessage, id cloud.InstanceSetID, logger logrus.FieldLogger) (cloud.InstanceSet, error) { +func (sd *StubDriver) InstanceSet(params json.RawMessage, id cloud.InstanceSetID, _ cloud.SharedResourceTags, logger logrus.FieldLogger) (cloud.InstanceSet, error) { if sd.holdCloudOps == nil { sd.holdCloudOps = make(chan bool) } @@ -99,6 +104,7 @@ type StubInstanceSet struct { allowCreateCall time.Time allowInstancesCall time.Time + lastInstanceID int } func (sis *StubInstanceSet) Create(it arvados.InstanceType, image cloud.ImageID, tags cloud.InstanceTags, cmd cloud.InitCommand, authKey ssh.PublicKey) (cloud.Instance, error) { @@ -120,12 +126,15 @@ func (sis *StubInstanceSet) Create(it arvados.InstanceType, image cloud.ImageID, if authKey != nil { ak = append([]ssh.PublicKey{authKey}, ak...) } + sis.lastInstanceID++ svm := &StubVM{ sis: sis, - id: cloud.InstanceID(fmt.Sprintf("stub-%s-%x", it.ProviderType, math_rand.Int63())), + id: cloud.InstanceID(fmt.Sprintf("inst%d,%s", sis.lastInstanceID, it.ProviderType)), tags: copyTags(tags), providerType: it.ProviderType, initCommand: cmd, + running: map[string]int64{}, + killing: map[string]bool{}, } svm.SSHService = SSHService{ HostKey: sis.driver.HostKey, @@ -177,12 +186,14 @@ func (e RateLimitError) EarliestRetry() time.Time { return e.Retry } // running (and might change IP addresses, shut down, etc.) without // updating any stubInstances that have been returned to callers. type StubVM struct { - Boot time.Time - Broken time.Time - CrunchRunMissing bool - CrunchRunCrashRate float64 - CrunchRunDetachDelay time.Duration - ExecuteContainer func(arvados.Container) int + Boot time.Time + Broken time.Time + ReportBroken time.Time + CrunchRunMissing bool + CrunchRunCrashRate float64 + CrunchRunDetachDelay time.Duration + ExecuteContainer func(arvados.Container) int + CrashRunningContainer func(arvados.Container) sis *StubInstanceSet id cloud.InstanceID @@ -190,7 +201,9 @@ type StubVM struct { initCommand cloud.InitCommand providerType string SSHService SSHService - running map[string]bool + running map[string]int64 + killing map[string]bool + lastPID int64 sync.Mutex } @@ -239,61 +252,86 @@ func (svm *StubVM) Exec(env map[string]string, command string, stdin io.Reader, } for _, name := range []string{"ARVADOS_API_HOST", "ARVADOS_API_TOKEN"} { if stdinKV[name] == "" { - fmt.Fprintf(stderr, "%s env var missing from stdin %q\n", name, stdin) + fmt.Fprintf(stderr, "%s env var missing from stdin %q\n", name, stdinData) return 1 } } svm.Lock() - if svm.running == nil { - svm.running = map[string]bool{} - } - svm.running[uuid] = true + svm.lastPID++ + pid := svm.lastPID + svm.running[uuid] = pid svm.Unlock() time.Sleep(svm.CrunchRunDetachDelay) fmt.Fprintf(stderr, "starting %s\n", uuid) logger := svm.sis.logger.WithFields(logrus.Fields{ "Instance": svm.id, "ContainerUUID": uuid, + "PID": pid, }) logger.Printf("[test] starting crunch-run stub") go func() { + var ctr arvados.Container + var started, completed bool + defer func() { + logger.Print("[test] exiting crunch-run stub") + svm.Lock() + defer svm.Unlock() + if svm.running[uuid] != pid { + if !completed { + bugf := svm.sis.driver.Bugf + if bugf == nil { + bugf = logger.Warnf + } + bugf("[test] StubDriver bug or caller bug: pid %d exiting, running[%s]==%d", pid, uuid, svm.running[uuid]) + } + } else { + delete(svm.running, uuid) + } + if !completed { + logger.WithField("State", ctr.State).Print("[test] crashing crunch-run stub") + if started && svm.CrashRunningContainer != nil { + svm.CrashRunningContainer(ctr) + } + } + }() + crashluck := math_rand.Float64() + wantCrash := crashluck < svm.CrunchRunCrashRate + wantCrashEarly := crashluck < svm.CrunchRunCrashRate/2 + ctr, ok := queue.Get(uuid) if !ok { logger.Print("[test] container not in queue") return } - if crashluck > svm.CrunchRunCrashRate/2 { - time.Sleep(time.Duration(math_rand.Float64()*20) * time.Millisecond) - ctr.State = arvados.ContainerStateRunning - queue.Notify(ctr) - } time.Sleep(time.Duration(math_rand.Float64()*20) * time.Millisecond) + svm.Lock() - _, running := svm.running[uuid] + killed := svm.running[uuid] != pid svm.Unlock() - if !running { - logger.Print("[test] container was killed") + if killed || wantCrashEarly { + return + } + + ctr.State = arvados.ContainerStateRunning + started = queue.Notify(ctr) + if !started { + ctr, _ = queue.Get(uuid) + logger.Print("[test] erroring out because state=Running update was rejected") + return + } + + if wantCrash { + logger.WithField("State", ctr.State).Print("[test] crashing crunch-run stub") return } if svm.ExecuteContainer != nil { ctr.ExitCode = svm.ExecuteContainer(ctr) } - // TODO: Check whether the stub instance has - // been destroyed, and if so, don't call - // queue.Notify. Then "container finished - // twice" can be classified as a bug. - if crashluck < svm.CrunchRunCrashRate { - logger.Print("[test] crashing crunch-run stub") - } else { - ctr.State = arvados.ContainerStateComplete - queue.Notify(ctr) - } - logger.Print("[test] exiting crunch-run stub") - svm.Lock() - defer svm.Unlock() - delete(svm.running, uuid) + logger.WithField("ExitCode", ctr.ExitCode).Print("[test] completing container") + ctr.State = arvados.ContainerStateComplete + completed = queue.Notify(ctr) }() return 0 } @@ -303,17 +341,41 @@ func (svm *StubVM) Exec(env map[string]string, command string, stdin io.Reader, for uuid := range svm.running { fmt.Fprintf(stdout, "%s\n", uuid) } + if !svm.ReportBroken.IsZero() && svm.ReportBroken.Before(time.Now()) { + fmt.Fprintln(stdout, "broken") + } return 0 } if strings.HasPrefix(command, "crunch-run --kill ") { svm.Lock() - defer svm.Unlock() - if svm.running[uuid] { - delete(svm.running, uuid) + pid, running := svm.running[uuid] + if running && !svm.killing[uuid] { + svm.killing[uuid] = true + go func() { + time.Sleep(time.Duration(math_rand.Float64()*30) * time.Millisecond) + svm.Lock() + defer svm.Unlock() + if svm.running[uuid] == pid { + // Kill only if the running entry + // hasn't since been killed and + // replaced with a different one. + delete(svm.running, uuid) + } + delete(svm.killing, uuid) + }() + svm.Unlock() + time.Sleep(time.Duration(math_rand.Float64()*2) * time.Millisecond) + svm.Lock() + _, running = svm.running[uuid] + } + svm.Unlock() + if running { + fmt.Fprintf(stderr, "%s: container is running\n", uuid) + return 1 } else { fmt.Fprintf(stderr, "%s: container is not running\n", uuid) + return 0 } - return 0 } if command == "true" { return 0 @@ -371,7 +433,9 @@ func (si stubInstance) SetTags(tags cloud.InstanceTags) error { } func (si stubInstance) Tags() cloud.InstanceTags { - return si.tags + // Return a copy to ensure a caller can't change our saved + // tags just by writing to the returned map. + return copyTags(si.tags) } func (si stubInstance) String() string {