X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0568e6de6a234ea25a3654ac4a68ad4b45a99ba9..92b530ffbb5022192f00977183e591ae81240347:/services/crunch-run/crunchrun_test.go diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go index 1946e5c403..9880230ce8 100644 --- a/services/crunch-run/crunchrun_test.go +++ b/services/crunch-run/crunchrun_test.go @@ -6,6 +6,7 @@ import ( "encoding/json" "errors" "fmt" + "git.curoverse.com/arvados.git/sdk/go/arvados" "git.curoverse.com/arvados.git/sdk/go/arvadosclient" "git.curoverse.com/arvados.git/sdk/go/keepclient" "git.curoverse.com/arvados.git/sdk/go/manifest" @@ -13,7 +14,12 @@ import ( . "gopkg.in/check.v1" "io" "io/ioutil" + "log" + "os" + "os/exec" + "sort" "strings" + "sync" "syscall" "testing" "time" @@ -32,10 +38,11 @@ var _ = Suite(&TestSuite{}) type ArvTestClient struct { Total int64 Calls int - Content arvadosclient.Dict - ContainerRecord + Content []arvadosclient.Dict + arvados.Container Logs map[string]*bytes.Buffer WasSetRunning bool + sync.Mutex } type KeepTestClient struct { @@ -50,23 +57,23 @@ var hwImageId = "9c31ee32b3d15268a0754e8edc74d4f815ee014b693bc5109058e431dd5caea var otherManifest = ". 68a84f561b1d1708c6baff5e019a9ab3+46+Ae5d0af96944a3690becb1decdf60cc1c937f556d@5693216f 0:46:md5sum.txt\n" var otherPDH = "a3e8f74c6f101eae01fa08bfb4e49b3a+54" +var fakeAuthUUID = "zzzzz-gj3su-55pqoyepgi2glem" +var fakeAuthToken = "a3ltuwzqcu2u4sc0q7yhpc2w7s00fdcqecg5d6e0u3pfohmbjt" + type TestDockerClient struct { - imageLoaded string - stdoutReader io.ReadCloser - stderrReader io.ReadCloser - stdoutWriter io.WriteCloser - stderrWriter io.WriteCloser - fn func(t *TestDockerClient) - finish chan dockerclient.WaitResult - stop chan bool - cwd string - env []string + imageLoaded string + logReader io.ReadCloser + logWriter io.WriteCloser + fn func(t *TestDockerClient) + finish chan dockerclient.WaitResult + stop chan bool + cwd string + env []string } func NewTestDockerClient() *TestDockerClient { t := &TestDockerClient{} - t.stdoutReader, t.stdoutWriter = io.Pipe() - t.stderrReader, t.stderrWriter = io.Pipe() + t.logReader, t.logWriter = io.Pipe() t.finish = make(chan dockerclient.WaitResult) t.stop = make(chan bool) t.cwd = "/" @@ -113,14 +120,8 @@ func (t *TestDockerClient) StartContainer(id string, config *dockerclient.HostCo } } -func (t *TestDockerClient) ContainerLogs(id string, options *dockerclient.LogOptions) (io.ReadCloser, error) { - if options.Stdout { - return t.stdoutReader, nil - } - if options.Stderr { - return t.stderrReader, nil - } - return nil, nil +func (t *TestDockerClient) AttachContainer(id string, options *dockerclient.AttachOptions) (io.ReadCloser, error) { + return t.logReader, nil } func (t *TestDockerClient) Wait(id string) <-chan dockerclient.WaitResult { @@ -131,61 +132,100 @@ func (*TestDockerClient) RemoveImage(name string, force bool) ([]*dockerclient.I return nil, nil } -func (this *ArvTestClient) Create(resourceType string, +func (client *ArvTestClient) Create(resourceType string, parameters arvadosclient.Dict, output interface{}) error { - this.Calls += 1 - this.Content = parameters + client.Mutex.Lock() + defer client.Mutex.Unlock() + + client.Calls += 1 + client.Content = append(client.Content, parameters) if resourceType == "logs" { - et := parameters["event_type"].(string) - if this.Logs == nil { - this.Logs = make(map[string]*bytes.Buffer) + et := parameters["log"].(arvadosclient.Dict)["event_type"].(string) + if client.Logs == nil { + client.Logs = make(map[string]*bytes.Buffer) } - if this.Logs[et] == nil { - this.Logs[et] = &bytes.Buffer{} + if client.Logs[et] == nil { + client.Logs[et] = &bytes.Buffer{} } - this.Logs[et].Write([]byte(parameters["properties"].(map[string]string)["text"])) + client.Logs[et].Write([]byte(parameters["log"].(arvadosclient.Dict)["properties"].(map[string]string)["text"])) } if resourceType == "collections" && output != nil { - mt := parameters["manifest_text"].(string) - outmap := output.(map[string]string) - outmap["portable_data_hash"] = fmt.Sprintf("%x+%d", md5.Sum([]byte(mt)), len(mt)) + mt := parameters["collection"].(arvadosclient.Dict)["manifest_text"].(string) + outmap := output.(*arvados.Collection) + outmap.PortableDataHash = fmt.Sprintf("%x+%d", md5.Sum([]byte(mt)), len(mt)) } return nil } -func (this *ArvTestClient) Get(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) error { +func (client *ArvTestClient) Call(method, resourceType, uuid, action string, parameters arvadosclient.Dict, output interface{}) error { + switch { + case method == "GET" && resourceType == "containers" && action == "auth": + return json.Unmarshal([]byte(`{ + "kind": "arvados#api_client_authorization", + "uuid": "`+fakeAuthUUID+`", + "api_token": "`+fakeAuthToken+`" + }`), output) + default: + return fmt.Errorf("Not found") + } +} + +func (client *ArvTestClient) Get(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) error { if resourceType == "collections" { if uuid == hwPDH { - output.(*Collection).ManifestText = hwManifest + output.(*arvados.Collection).ManifestText = hwManifest } else if uuid == otherPDH { - output.(*Collection).ManifestText = otherManifest + output.(*arvados.Collection).ManifestText = otherManifest } } if resourceType == "containers" { - (*output.(*ContainerRecord)) = this.ContainerRecord + (*output.(*arvados.Container)) = client.Container } return nil } -func (this *ArvTestClient) Update(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) (err error) { - - this.Content = parameters +func (client *ArvTestClient) Update(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) (err error) { + client.Mutex.Lock() + defer client.Mutex.Unlock() + client.Calls += 1 + client.Content = append(client.Content, parameters) if resourceType == "containers" { - if parameters["state"] == "Running" { - this.WasSetRunning = true + if parameters["container"].(arvadosclient.Dict)["state"] == "Running" { + client.WasSetRunning = true } + } + return nil +} +// CalledWith returns the parameters from the first API call whose +// parameters match jpath/string. E.g., CalledWith(c, "foo.bar", +// "baz") returns parameters with parameters["foo"]["bar"]=="baz". If +// no call matches, it returns nil. +func (client *ArvTestClient) CalledWith(jpath, expect string) arvadosclient.Dict { +call: + for _, content := range client.Content { + var v interface{} = content + for _, k := range strings.Split(jpath, ".") { + if dict, ok := v.(arvadosclient.Dict); !ok { + continue call + } else { + v = dict[k] + } + } + if v, ok := v.(string); ok && v == expect { + return content + } } return nil } -func (this *KeepTestClient) PutHB(hash string, buf []byte) (string, int, error) { - this.Content = buf +func (client *KeepTestClient) PutHB(hash string, buf []byte) (string, int, error) { + client.Content = buf return fmt.Sprintf("%s+%d", hash, len(buf)), len(buf), nil } @@ -194,14 +234,14 @@ type FileWrapper struct { len uint64 } -func (this FileWrapper) Len() uint64 { - return this.len +func (fw FileWrapper) Len() uint64 { + return fw.len } -func (this *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { +func (client *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { if filename == hwImageId+".tar" { rdr := ioutil.NopCloser(&bytes.Buffer{}) - this.Called = true + client.Called = true return FileWrapper{rdr, 1321984}, nil } return nil, nil @@ -210,14 +250,14 @@ func (this *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename str func (s *TestSuite) TestLoadImage(c *C) { kc := &KeepTestClient{} docker := NewTestDockerClient() - cr := NewContainerRunner(&ArvTestClient{}, kc, docker) + cr := NewContainerRunner(&ArvTestClient{}, kc, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") _, err := cr.Docker.RemoveImage(hwImageId, true) _, err = cr.Docker.InspectImage(hwImageId) c.Check(err, NotNil) - cr.ContainerRecord.ContainerImage = hwPDH + cr.Container.ContainerImage = hwPDH // (1) Test loading image from keep c.Check(kc.Called, Equals, false) @@ -248,86 +288,92 @@ func (s *TestSuite) TestLoadImage(c *C) { } type ArvErrorTestClient struct{} -type KeepErrorTestClient struct{} -type KeepReadErrorTestClient struct{} -func (this ArvErrorTestClient) Create(resourceType string, +func (ArvErrorTestClient) Create(resourceType string, parameters arvadosclient.Dict, output interface{}) error { return nil } -func (this ArvErrorTestClient) Get(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) error { +func (ArvErrorTestClient) Call(method, resourceType, uuid, action string, parameters arvadosclient.Dict, output interface{}) error { return errors.New("ArvError") } -func (this ArvErrorTestClient) Update(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) (err error) { +func (ArvErrorTestClient) Get(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) error { + return errors.New("ArvError") +} + +func (ArvErrorTestClient) Update(resourceType string, uuid string, parameters arvadosclient.Dict, output interface{}) (err error) { return nil } -func (this KeepErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) { - return "", 0, nil +type KeepErrorTestClient struct{} + +func (KeepErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) { + return "", 0, errors.New("KeepError") } -func (this KeepErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { +func (KeepErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { return nil, errors.New("KeepError") } -func (this KeepReadErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) { +type KeepReadErrorTestClient struct{} + +func (KeepReadErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) { return "", 0, nil } type ErrorReader struct{} -func (this ErrorReader) Read(p []byte) (n int, err error) { +func (ErrorReader) Read(p []byte) (n int, err error) { return 0, errors.New("ErrorReader") } -func (this ErrorReader) Close() error { +func (ErrorReader) Close() error { return nil } -func (this ErrorReader) Len() uint64 { +func (ErrorReader) Len() uint64 { return 0 } -func (this KeepReadErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { +func (KeepReadErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { return ErrorReader{}, nil } func (s *TestSuite) TestLoadImageArvError(c *C) { // (1) Arvados error - cr := NewContainerRunner(ArvErrorTestClient{}, &KeepTestClient{}, nil) - cr.ContainerRecord.ContainerImage = hwPDH + cr := NewContainerRunner(ArvErrorTestClient{}, &KeepTestClient{}, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + cr.Container.ContainerImage = hwPDH err := cr.LoadImage() - c.Check(err.Error(), Equals, "ArvError") + c.Check(err.Error(), Equals, "While getting container image collection: ArvError") } func (s *TestSuite) TestLoadImageKeepError(c *C) { // (2) Keep error docker := NewTestDockerClient() - cr := NewContainerRunner(&ArvTestClient{}, KeepErrorTestClient{}, docker) - cr.ContainerRecord.ContainerImage = hwPDH + cr := NewContainerRunner(&ArvTestClient{}, KeepErrorTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + cr.Container.ContainerImage = hwPDH err := cr.LoadImage() - c.Check(err.Error(), Equals, "KeepError") + c.Check(err.Error(), Equals, "While creating ManifestFileReader for container image: KeepError") } func (s *TestSuite) TestLoadImageCollectionError(c *C) { // (3) Collection doesn't contain image - cr := NewContainerRunner(&ArvTestClient{}, KeepErrorTestClient{}, nil) - cr.ContainerRecord.ContainerImage = otherPDH + cr := NewContainerRunner(&ArvTestClient{}, KeepErrorTestClient{}, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + cr.Container.ContainerImage = otherPDH err := cr.LoadImage() - c.Check(err.Error(), Equals, "First file in the collection does not end in .tar") + c.Check(err.Error(), Equals, "First file in the container image collection does not end in .tar") } func (s *TestSuite) TestLoadImageKeepReadError(c *C) { // (4) Collection doesn't contain image docker := NewTestDockerClient() - cr := NewContainerRunner(&ArvTestClient{}, KeepReadErrorTestClient{}, docker) - cr.ContainerRecord.ContainerImage = hwPDH + cr := NewContainerRunner(&ArvTestClient{}, KeepReadErrorTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + cr.Container.ContainerImage = hwPDH err := cr.LoadImage() c.Check(err, NotNil) @@ -337,46 +383,54 @@ type ClosableBuffer struct { bytes.Buffer } +func (*ClosableBuffer) Close() error { + return nil +} + type TestLogs struct { Stdout ClosableBuffer Stderr ClosableBuffer } -func (this *ClosableBuffer) Close() error { - return nil -} - -func (this *TestLogs) NewTestLoggingWriter(logstr string) io.WriteCloser { +func (tl *TestLogs) NewTestLoggingWriter(logstr string) io.WriteCloser { if logstr == "stdout" { - return &this.Stdout + return &tl.Stdout } if logstr == "stderr" { - return &this.Stderr + return &tl.Stderr } return nil } +func dockerLog(fd byte, msg string) []byte { + by := []byte(msg) + header := make([]byte, 8+len(by)) + header[0] = fd + header[7] = byte(len(by)) + copy(header[8:], by) + return header +} + func (s *TestSuite) TestRunContainer(c *C) { docker := NewTestDockerClient() docker.fn = func(t *TestDockerClient) { - t.stdoutWriter.Write([]byte("Hello world\n")) - t.stdoutWriter.Close() - t.stderrWriter.Close() + t.logWriter.Write(dockerLog(1, "Hello world\n")) + t.logWriter.Close() t.finish <- dockerclient.WaitResult{} } - cr := NewContainerRunner(&ArvTestClient{}, &KeepTestClient{}, docker) + cr := NewContainerRunner(&ArvTestClient{}, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") var logs TestLogs cr.NewLogWriter = logs.NewTestLoggingWriter - cr.ContainerRecord.ContainerImage = hwPDH - cr.ContainerRecord.Command = []string{"./hw"} + cr.Container.ContainerImage = hwPDH + cr.Container.Command = []string{"./hw"} err := cr.LoadImage() c.Check(err, IsNil) - err = cr.StartContainer() + err = cr.CreateContainer() c.Check(err, IsNil) - err = cr.AttachLogs() + err = cr.StartContainer() c.Check(err, IsNil) err = cr.WaitFinish() @@ -389,8 +443,7 @@ func (s *TestSuite) TestRunContainer(c *C) { func (s *TestSuite) TestCommitLogs(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} - cr := NewContainerRunner(api, kc, nil) - cr.ContainerRecord.UUID = "zzzzz-zzzzz-zzzzzzzzzzzzzzz" + cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") cr.CrunchLog.Timestamper = (&TestTimestamper{}).Timestamp cr.CrunchLog.Print("Hello world!") @@ -400,28 +453,27 @@ func (s *TestSuite) TestCommitLogs(c *C) { err := cr.CommitLogs() c.Check(err, IsNil) - c.Check(api.Content["name"], Equals, "logs for zzzzz-zzzzz-zzzzzzzzzzzzzzz") - c.Check(api.Content["manifest_text"], Equals, ". 744b2e4553123b02fa7b452ec5c18993+123 0:123:crunch-run.txt\n") + c.Check(api.Calls, Equals, 2) + c.Check(api.Content[1]["collection"].(arvadosclient.Dict)["name"], Equals, "logs for zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Check(api.Content[1]["collection"].(arvadosclient.Dict)["manifest_text"], Equals, ". 744b2e4553123b02fa7b452ec5c18993+123 0:123:crunch-run.txt\n") c.Check(*cr.LogsPDH, Equals, "63da7bdacf08c40f604daad80c261e9a+60") } -func (s *TestSuite) TestUpdateContainerRecordRunning(c *C) { +func (s *TestSuite) TestUpdateContainerRunning(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} - cr := NewContainerRunner(api, kc, nil) - cr.ContainerRecord.UUID = "zzzzz-zzzzz-zzzzzzzzzzzzzzz" + cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - err := cr.UpdateContainerRecordRunning() + err := cr.UpdateContainerRunning() c.Check(err, IsNil) - c.Check(api.Content["state"], Equals, "Running") + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["state"], Equals, "Running") } -func (s *TestSuite) TestUpdateContainerRecordComplete(c *C) { +func (s *TestSuite) TestUpdateContainerComplete(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} - cr := NewContainerRunner(api, kc, nil) - cr.ContainerRecord.UUID = "zzzzz-zzzzz-zzzzzzzzzzzzzzz" + cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") cr.LogsPDH = new(string) *cr.LogsPDH = "d3a229d2fe3690c2c3e75a71a153c6a3+60" @@ -430,49 +482,50 @@ func (s *TestSuite) TestUpdateContainerRecordComplete(c *C) { *cr.ExitCode = 42 cr.finalState = "Complete" - err := cr.UpdateContainerRecordComplete() + err := cr.UpdateContainerFinal() c.Check(err, IsNil) - c.Check(api.Content["log"], Equals, *cr.LogsPDH) - c.Check(api.Content["exit_code"], Equals, *cr.ExitCode) - c.Check(api.Content["state"], Equals, "Complete") + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["log"], Equals, *cr.LogsPDH) + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["exit_code"], Equals, *cr.ExitCode) + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") } -func (s *TestSuite) TestUpdateContainerRecordCancelled(c *C) { +func (s *TestSuite) TestUpdateContainerCancelled(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} - cr := NewContainerRunner(api, kc, nil) - cr.ContainerRecord.UUID = "zzzzz-zzzzz-zzzzzzzzzzzzzzz" + cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") cr.Cancelled = true cr.finalState = "Cancelled" - err := cr.UpdateContainerRecordComplete() + err := cr.UpdateContainerFinal() c.Check(err, IsNil) - c.Check(api.Content["log"], IsNil) - c.Check(api.Content["exit_code"], IsNil) - c.Check(api.Content["state"], Equals, "Cancelled") + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["log"], IsNil) + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["exit_code"], IsNil) + c.Check(api.Content[0]["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled") } // Used by the TestFullRun*() test below to DRY up boilerplate setup to do full -// dress rehersal of the Run() function, starting from a JSON container record. +// dress rehearsal of the Run() function, starting from a JSON container record. func FullRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner) { - rec := ContainerRecord{} - err := json.NewDecoder(strings.NewReader(record)).Decode(&rec) + rec := arvados.Container{} + err := json.Unmarshal([]byte(record), &rec) c.Check(err, IsNil) docker := NewTestDockerClient() docker.fn = fn docker.RemoveImage(hwImageId, true) - api = &ArvTestClient{ContainerRecord: rec} - cr = NewContainerRunner(api, &KeepTestClient{}, docker) + api = &ArvTestClient{Container: rec} + cr = NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + am := &ArvMountCmdLine{} + cr.RunArvMount = am.ArvMountTest - err = cr.Run("zzzzz-zzzzz-zzzzzzzzzzzzzzz") + err = cr.Run() c.Check(err, IsNil) c.Check(api.WasSetRunning, Equals, true) - c.Check(api.Content["log"], NotNil) + c.Check(api.Content[api.Calls-1]["container"].(arvadosclient.Dict)["log"], NotNil) if err != nil { for k, v := range api.Logs { @@ -490,19 +543,19 @@ func (s *TestSuite) TestFullRunHello(c *C) { "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", "environment": {}, - "mounts": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, "output_path": "/tmp", "priority": 1, "runtime_constraints": {} }`, func(t *TestDockerClient) { - t.stdoutWriter.Write([]byte("hello world\n")) - t.stdoutWriter.Close() - t.stderrWriter.Close() + t.logWriter.Write(dockerLog(1, "hello world\n")) + t.logWriter.Close() t.finish <- dockerclient.WaitResult{} }) - c.Check(api.Content["exit_code"], Equals, 0) - c.Check(api.Content["state"], Equals, "Complete") + c.Check(api.Calls, Equals, 7) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "hello world\n"), Equals, true) @@ -514,21 +567,21 @@ func (s *TestSuite) TestFullRunStderr(c *C) { "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", "environment": {}, - "mounts": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, "output_path": "/tmp", "priority": 1, "runtime_constraints": {} }`, func(t *TestDockerClient) { - t.stdoutWriter.Write([]byte("hello\n")) - t.stderrWriter.Write([]byte("world\n")) - t.stdoutWriter.Close() - t.stderrWriter.Close() + t.logWriter.Write(dockerLog(1, "hello\n")) + t.logWriter.Write(dockerLog(2, "world\n")) + t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 1} }) - c.Check(api.Content["log"], NotNil) - c.Check(api.Content["exit_code"], Equals, 1) - c.Check(api.Content["state"], Equals, "Complete") + c.Assert(api.Calls, Equals, 8) + c.Check(api.Content[7]["container"].(arvadosclient.Dict)["log"], NotNil) + c.Check(api.Content[7]["container"].(arvadosclient.Dict)["exit_code"], Equals, 1) + c.Check(api.Content[7]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "hello\n"), Equals, true) c.Check(strings.HasSuffix(api.Logs["stderr"].String(), "world\n"), Equals, true) @@ -540,19 +593,21 @@ func (s *TestSuite) TestFullRunDefaultCwd(c *C) { "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", "environment": {}, - "mounts": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, "output_path": "/tmp", "priority": 1, "runtime_constraints": {} }`, func(t *TestDockerClient) { - t.stdoutWriter.Write([]byte(t.cwd + "\n")) - t.stdoutWriter.Close() - t.stderrWriter.Close() + t.logWriter.Write(dockerLog(1, t.cwd+"\n")) + t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 0} }) - c.Check(api.Content["exit_code"], Equals, 0) - c.Check(api.Content["state"], Equals, "Complete") + c.Check(api.Calls, Equals, 7) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") + + log.Print(api.Logs["stdout"].String()) c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "/\n"), Equals, true) } @@ -563,19 +618,19 @@ func (s *TestSuite) TestFullRunSetCwd(c *C) { "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": "/bin", "environment": {}, - "mounts": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, "output_path": "/tmp", "priority": 1, "runtime_constraints": {} }`, func(t *TestDockerClient) { - t.stdoutWriter.Write([]byte(t.cwd + "\n")) - t.stdoutWriter.Close() - t.stderrWriter.Close() + t.logWriter.Write(dockerLog(1, t.cwd+"\n")) + t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 0} }) - c.Check(api.Content["exit_code"], Equals, 0) - c.Check(api.Content["state"], Equals, "Complete") + c.Check(api.Calls, Equals, 7) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "/bin\n"), Equals, true) } @@ -586,42 +641,40 @@ func (s *TestSuite) TestCancel(c *C) { "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", "environment": {}, - "mounts": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, "output_path": "/tmp", "priority": 1, "runtime_constraints": {} }` - rec := ContainerRecord{} - err := json.NewDecoder(strings.NewReader(record)).Decode(&rec) + rec := arvados.Container{} + err := json.Unmarshal([]byte(record), &rec) c.Check(err, IsNil) docker := NewTestDockerClient() docker.fn = func(t *TestDockerClient) { <-t.stop - t.stdoutWriter.Write([]byte("foo\n")) - t.stdoutWriter.Close() - t.stderrWriter.Close() + t.logWriter.Write(dockerLog(1, "foo\n")) + t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 0} } docker.RemoveImage(hwImageId, true) - api := &ArvTestClient{ContainerRecord: rec} - cr := NewContainerRunner(api, &KeepTestClient{}, docker) + api := &ArvTestClient{Container: rec} + cr := NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + am := &ArvMountCmdLine{} + cr.RunArvMount = am.ArvMountTest go func() { for cr.ContainerID == "" { - time.Sleep(1 * time.Second) + time.Sleep(time.Millisecond) } cr.SigChan <- syscall.SIGINT }() - err = cr.Run("zzzzz-zzzzz-zzzzzzzzzzzzzzz") + err = cr.Run() c.Check(err, IsNil) - - c.Check(api.Content["log"], NotNil) - if err != nil { for k, v := range api.Logs { c.Log(k) @@ -629,8 +682,9 @@ func (s *TestSuite) TestCancel(c *C) { } } - c.Check(api.Content["state"], Equals, "Cancelled") - + c.Assert(api.Calls, Equals, 6) + c.Check(api.Content[5]["container"].(arvadosclient.Dict)["log"], IsNil) + c.Check(api.Content[5]["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "foo\n"), Equals, true) } @@ -641,19 +695,166 @@ func (s *TestSuite) TestFullRunSetEnv(c *C) { "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": "/bin", "environment": {"FROBIZ": "bilbo"}, - "mounts": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, "output_path": "/tmp", "priority": 1, "runtime_constraints": {} }`, func(t *TestDockerClient) { - t.stdoutWriter.Write([]byte(t.env[0][7:] + "\n")) - t.stdoutWriter.Close() - t.stderrWriter.Close() + t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) + t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 0} }) - c.Check(api.Content["exit_code"], Equals, 0) - c.Check(api.Content["state"], Equals, "Complete") + c.Check(api.Calls, Equals, 7) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) + c.Check(api.Content[6]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "bilbo\n"), Equals, true) } + +type ArvMountCmdLine struct { + Cmd []string + token string +} + +func (am *ArvMountCmdLine) ArvMountTest(c []string, token string) (*exec.Cmd, error) { + am.Cmd = c + am.token = token + return nil, nil +} + +func (s *TestSuite) TestSetupMounts(c *C) { + api := &ArvTestClient{} + kc := &KeepTestClient{} + cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + am := &ArvMountCmdLine{} + cr.RunArvMount = am.ArvMountTest + + i := 0 + cr.MkTempDir = func(string, string) (string, error) { + i += 1 + d := fmt.Sprintf("/tmp/mktmpdir%d", i) + os.Mkdir(d, os.ModePerm) + return d, nil + } + + { + cr.Container.Mounts = make(map[string]arvados.Mount) + cr.Container.Mounts["/tmp"] = arvados.Mount{Kind: "tmp"} + cr.OutputPath = "/tmp" + + err := cr.SetupMounts() + c.Check(err, IsNil) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-by-pdh", "by_id", "/tmp/mktmpdir1"}) + c.Check(cr.Binds, DeepEquals, []string{"/tmp/mktmpdir2:/tmp"}) + cr.CleanupDirs() + } + + { + i = 0 + cr.Container.Mounts = make(map[string]arvados.Mount) + cr.Container.Mounts["/keeptmp"] = arvados.Mount{Kind: "collection", Writable: true} + cr.OutputPath = "/keeptmp" + + os.MkdirAll("/tmp/mktmpdir1/tmp0", os.ModePerm) + + err := cr.SetupMounts() + c.Check(err, IsNil) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", "/tmp/mktmpdir1"}) + c.Check(cr.Binds, DeepEquals, []string{"/tmp/mktmpdir1/tmp0:/keeptmp"}) + cr.CleanupDirs() + } + + { + i = 0 + cr.Container.Mounts = make(map[string]arvados.Mount) + cr.Container.Mounts["/keepinp"] = arvados.Mount{Kind: "collection", PortableDataHash: "59389a8f9ee9d399be35462a0f92541c+53"} + cr.Container.Mounts["/keepout"] = arvados.Mount{Kind: "collection", Writable: true} + cr.OutputPath = "/keepout" + + os.MkdirAll("/tmp/mktmpdir1/by_id/59389a8f9ee9d399be35462a0f92541c+53", os.ModePerm) + os.MkdirAll("/tmp/mktmpdir1/tmp0", os.ModePerm) + + err := cr.SetupMounts() + c.Check(err, IsNil) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", "/tmp/mktmpdir1"}) + var ss sort.StringSlice = cr.Binds + ss.Sort() + c.Check(cr.Binds, DeepEquals, []string{"/tmp/mktmpdir1/by_id/59389a8f9ee9d399be35462a0f92541c+53:/keepinp:ro", + "/tmp/mktmpdir1/tmp0:/keepout"}) + cr.CleanupDirs() + } +} + +func (s *TestSuite) TestStdout(c *C) { + helperRecord := `{` + helperRecord += `"command": ["/bin/sh", "-c", "echo $FROBIZ"],` + helperRecord += `"container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122",` + helperRecord += `"cwd": "/bin",` + helperRecord += `"environment": {"FROBIZ": "bilbo"},` + helperRecord += `"mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "file", "path": "/tmp/a/b/c.out"} },` + helperRecord += `"output_path": "/tmp",` + helperRecord += `"priority": 1,` + helperRecord += `"runtime_constraints": {}` + helperRecord += `}` + + api, _ := FullRunHelper(c, helperRecord, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) + t.logWriter.Close() + t.finish <- dockerclient.WaitResult{ExitCode: 0} + }) + + c.Assert(api.Calls, Equals, 6) + c.Check(api.Content[5]["container"].(arvadosclient.Dict)["exit_code"], Equals, 0) + c.Check(api.Content[5]["container"].(arvadosclient.Dict)["state"], Equals, "Complete") + c.Check(api.CalledWith("collection.manifest_text", "./a/b 307372fa8fd5c146b22ae7a45b49bc31+6 0:6:c.out\n"), Not(IsNil)) +} + +// Used by the TestStdoutWithWrongPath*() +func StdoutErrorRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner, err error) { + rec := arvados.Container{} + err = json.Unmarshal([]byte(record), &rec) + c.Check(err, IsNil) + + docker := NewTestDockerClient() + docker.fn = fn + docker.RemoveImage(hwImageId, true) + + api = &ArvTestClient{Container: rec} + cr = NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + am := &ArvMountCmdLine{} + cr.RunArvMount = am.ArvMountTest + + err = cr.Run() + return +} + +func (s *TestSuite) TestStdoutWithWrongPath(c *C) { + _, _, err := StdoutErrorRunHelper(c, `{ + "mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "file", "path":"/tmpa.out"} }, + "output_path": "/tmp" +}`, func(t *TestDockerClient) {}) + + c.Check(err, NotNil) + c.Check(strings.Contains(err.Error(), "Stdout path does not start with OutputPath"), Equals, true) +} + +func (s *TestSuite) TestStdoutWithWrongKindTmp(c *C) { + _, _, err := StdoutErrorRunHelper(c, `{ + "mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "tmp", "path":"/tmp/a.out"} }, + "output_path": "/tmp" +}`, func(t *TestDockerClient) {}) + + c.Check(err, NotNil) + c.Check(strings.Contains(err.Error(), "Unsupported mount kind 'tmp' for stdout"), Equals, true) +} + +func (s *TestSuite) TestStdoutWithWrongKindCollection(c *C) { + _, _, err := StdoutErrorRunHelper(c, `{ + "mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "collection", "path":"/tmp/a.out"} }, + "output_path": "/tmp" +}`, func(t *TestDockerClient) {}) + + c.Check(err, NotNil) + c.Check(strings.Contains(err.Error(), "Unsupported mount kind 'collection' for stdout"), Equals, true) +}