X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44f0e83d50f688bf73c336747402d490346f5c34..eae48c31bb338689ec67fbc6a14a2e0b1fb5e3b6:/services/crunch-run/crunchrun_test.go?ds=sidebyside diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go index 1f2aa201c4..2c7145998a 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,11 +14,12 @@ import ( . "gopkg.in/check.v1" "io" "io/ioutil" - "log" "os" "os/exec" + "path/filepath" "sort" "strings" + "sync" "syscall" "testing" "time" @@ -37,9 +39,10 @@ type ArvTestClient struct { Total int64 Calls int Content []arvadosclient.Dict - ContainerRecord + arvados.Container Logs map[string]*bytes.Buffer WasSetRunning bool + sync.Mutex } type KeepTestClient struct { @@ -54,6 +57,9 @@ 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 logReader io.ReadCloser @@ -63,6 +69,7 @@ type TestDockerClient struct { stop chan bool cwd string env []string + api *ArvTestClient } func NewTestDockerClient() *TestDockerClient { @@ -126,61 +133,106 @@ 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 = append(this.Content, parameters) + client.Mutex.Lock() + defer client.Mutex.Unlock() + + client.Calls++ + client.Content = append(client.Content, parameters) if resourceType == "logs" { et := parameters["log"].(arvadosclient.Dict)["event_type"].(string) - if this.Logs == nil { - this.Logs = make(map[string]*bytes.Buffer) + 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["log"].(arvadosclient.Dict)["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["collection"].(arvadosclient.Dict)["manifest_text"].(string) - outmap := output.(*CollectionRecord) + 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.(*CollectionRecord).ManifestText = hwManifest + output.(*arvados.Collection).ManifestText = hwManifest } else if uuid == otherPDH { - output.(*CollectionRecord).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.Calls += 1 - this.Content = append(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++ + client.Content = append(client.Content, parameters) if resourceType == "containers" { if parameters["container"].(arvadosclient.Dict)["state"] == "Running" { - this.WasSetRunning = true + client.WasSetRunning = true } + } + return nil +} + +var discoveryMap = map[string]interface{}{"defaultTrashLifetime": float64(1209600)} + +func (client *ArvTestClient) Discovery(key string) (interface{}, error) { + return discoveryMap[key], 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 string, expect interface{}) 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 == 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 } @@ -189,14 +241,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 @@ -212,7 +264,7 @@ func (s *TestSuite) TestLoadImage(c *C) { _, 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) @@ -243,57 +295,67 @@ 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) { +func (ArvErrorTestClient) Discovery(key string) (interface{}, error) { + return discoveryMap[key], 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, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - cr.ContainerRecord.ContainerImage = hwPDH + cr.Container.ContainerImage = hwPDH err := cr.LoadImage() c.Check(err.Error(), Equals, "While getting container image collection: ArvError") @@ -303,7 +365,7 @@ func (s *TestSuite) TestLoadImageKeepError(c *C) { // (2) Keep error docker := NewTestDockerClient() cr := NewContainerRunner(&ArvTestClient{}, KeepErrorTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - cr.ContainerRecord.ContainerImage = hwPDH + cr.Container.ContainerImage = hwPDH err := cr.LoadImage() c.Check(err.Error(), Equals, "While creating ManifestFileReader for container image: KeepError") @@ -312,7 +374,7 @@ func (s *TestSuite) TestLoadImageKeepError(c *C) { func (s *TestSuite) TestLoadImageCollectionError(c *C) { // (3) Collection doesn't contain image cr := NewContainerRunner(&ArvTestClient{}, KeepErrorTestClient{}, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - cr.ContainerRecord.ContainerImage = otherPDH + cr.Container.ContainerImage = otherPDH err := cr.LoadImage() c.Check(err.Error(), Equals, "First file in the container image collection does not end in .tar") @@ -322,7 +384,7 @@ func (s *TestSuite) TestLoadImageKeepReadError(c *C) { // (4) Collection doesn't contain image docker := NewTestDockerClient() cr := NewContainerRunner(&ArvTestClient{}, KeepReadErrorTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - cr.ContainerRecord.ContainerImage = hwPDH + cr.Container.ContainerImage = hwPDH err := cr.LoadImage() c.Check(err, NotNil) @@ -332,21 +394,21 @@ 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 } @@ -371,11 +433,14 @@ func (s *TestSuite) TestRunContainer(c *C) { 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.CreateContainer() + c.Check(err, IsNil) + err = cr.StartContainer() c.Check(err, IsNil) @@ -405,18 +470,18 @@ func (s *TestSuite) TestCommitLogs(c *C) { 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, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - err := cr.UpdateContainerRecordRunning() + err := cr.UpdateContainerRunning() c.Check(err, IsNil) 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, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") @@ -428,7 +493,7 @@ 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[0]["container"].(arvadosclient.Dict)["log"], Equals, *cr.LogsPDH) @@ -436,14 +501,14 @@ func (s *TestSuite) TestUpdateContainerRecordComplete(c *C) { 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, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") cr.Cancelled = true cr.finalState = "Cancelled" - err := cr.UpdateContainerRecordComplete() + err := cr.UpdateContainerFinal() c.Check(err, IsNil) c.Check(api.Content[0]["container"].(arvadosclient.Dict)["log"], IsNil) @@ -454,16 +519,18 @@ func (s *TestSuite) TestUpdateContainerRecordCancelled(c *C) { // Used by the TestFullRun*() test below to DRY up boilerplate setup to do full // 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} + api = &ArvTestClient{Container: rec} + docker.api = api cr = NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + cr.statInterval = 100 * time.Millisecond am := &ArvMountCmdLine{} cr.RunArvMount = am.ArvMountTest @@ -499,14 +566,45 @@ func (s *TestSuite) TestFullRunHello(c *C) { t.finish <- dockerclient.WaitResult{} }) - 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(api.CalledWith("container.exit_code", 0), NotNil) + c.Check(api.CalledWith("container.state", "Complete"), NotNil) c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "hello world\n"), Equals, true) } +func (s *TestSuite) TestCrunchstat(c *C) { + api, _ := FullRunHelper(c, `{ + "command": ["sleep", "1"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": ".", + "environment": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} + }`, func(t *TestDockerClient) { + time.Sleep(time.Second) + t.logWriter.Close() + t.finish <- dockerclient.WaitResult{} + }) + + c.Check(api.CalledWith("container.exit_code", 0), NotNil) + c.Check(api.CalledWith("container.state", "Complete"), NotNil) + + // We didn't actually start a container, so crunchstat didn't + // find accounting files and therefore didn't log any stats. + // It should have logged a "can't find accounting files" + // message after one poll interval, though, so we can confirm + // it's alive: + c.Assert(api.Logs["crunchstat"], NotNil) + c.Check(api.Logs["crunchstat"].String(), Matches, `(?ms).*cgroup stats files have not appeared after 100ms.*`) + + // The "files never appeared" log assures us that we called + // (*crunchstat.Reporter)Stop(), and that we set it up with + // the correct container ID "abcde": + c.Check(api.Logs["crunchstat"].String(), Matches, `(?ms).*cgroup stats files never appeared for abcde\n`) +} + func (s *TestSuite) TestFullRunStderr(c *C) { api, _ := FullRunHelper(c, `{ "command": ["/bin/sh", "-c", "echo hello ; echo world 1>&2 ; exit 1"], @@ -524,10 +622,10 @@ func (s *TestSuite) TestFullRunStderr(c *C) { t.finish <- dockerclient.WaitResult{ExitCode: 1} }) - 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") + final := api.CalledWith("container.state", "Complete") + c.Assert(final, NotNil) + c.Check(final["container"].(arvadosclient.Dict)["exit_code"], Equals, 1) + c.Check(final["container"].(arvadosclient.Dict)["log"], NotNil) c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "hello\n"), Equals, true) c.Check(strings.HasSuffix(api.Logs["stderr"].String(), "world\n"), Equals, true) @@ -549,12 +647,9 @@ func (s *TestSuite) TestFullRunDefaultCwd(c *C) { t.finish <- dockerclient.WaitResult{ExitCode: 0} }) - 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(api.CalledWith("container.exit_code", 0), NotNil) + c.Check(api.CalledWith("container.state", "Complete"), NotNil) + c.Log(api.Logs["stdout"]) c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "/\n"), Equals, true) } @@ -574,10 +669,8 @@ func (s *TestSuite) TestFullRunSetCwd(c *C) { t.finish <- dockerclient.WaitResult{ExitCode: 0} }) - 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(api.CalledWith("container.exit_code", 0), NotNil) + c.Check(api.CalledWith("container.state", "Complete"), NotNil) c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "/bin\n"), Equals, true) } @@ -593,8 +686,8 @@ func (s *TestSuite) TestCancel(c *C) { "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() @@ -606,14 +699,14 @@ func (s *TestSuite) TestCancel(c *C) { } docker.RemoveImage(hwImageId, true) - api := &ArvTestClient{ContainerRecord: rec} + 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 }() @@ -621,10 +714,6 @@ func (s *TestSuite) TestCancel(c *C) { err = cr.Run() c.Check(err, IsNil) - - c.Check(api.Calls, Equals, 6) - c.Check(api.Content[5]["container"].(arvadosclient.Dict)["log"], NotNil) - if err != nil { for k, v := range api.Logs { c.Log(k) @@ -632,8 +721,8 @@ func (s *TestSuite) TestCancel(c *C) { } } - c.Check(api.Content[5]["container"].(arvadosclient.Dict)["state"], Equals, "Cancelled") - + c.Check(api.CalledWith("container.log", nil), NotNil) + c.Check(api.CalledWith("container.state", "Cancelled"), NotNil) c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "foo\n"), Equals, true) } @@ -654,19 +743,19 @@ func (s *TestSuite) TestFullRunSetEnv(c *C) { t.finish <- dockerclient.WaitResult{ExitCode: 0} }) - 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(api.CalledWith("container.exit_code", 0), NotNil) + c.Check(api.CalledWith("container.state", "Complete"), NotNil) c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "bilbo\n"), Equals, true) } type ArvMountCmdLine struct { - Cmd []string + Cmd []string + token string } -func (am *ArvMountCmdLine) ArvMountTest(c []string) (*exec.Cmd, error) { +func (am *ArvMountCmdLine) ArvMountTest(c []string, token string) (*exec.Cmd, error) { am.Cmd = c + am.token = token return nil, nil } @@ -677,73 +766,139 @@ func (s *TestSuite) TestSetupMounts(c *C) { am := &ArvMountCmdLine{} cr.RunArvMount = am.ArvMountTest + realTemp, err := ioutil.TempDir("", "crunchrun_test-") + c.Assert(err, IsNil) + defer os.RemoveAll(realTemp) + 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.MkTempDir = func(_ string, prefix string) (string, error) { + i++ + d := fmt.Sprintf("%s/%s%d", realTemp, prefix, i) + err := os.Mkdir(d, os.ModePerm) + if err != nil && strings.Contains(err.Error(), ": file exists") { + // Test case must have pre-populated the tempdir + err = nil + } + return d, err + } + + checkEmpty := func() { + filepath.Walk(realTemp, func(path string, _ os.FileInfo, err error) error { + c.Check(path, Equals, realTemp) + c.Check(err, IsNil) + return nil + }) } { - cr.ContainerRecord.Mounts = make(map[string]Mount) - cr.ContainerRecord.Mounts["/tmp"] = Mount{Kind: "tmp"} + i = 0 + 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"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(cr.Binds, DeepEquals, []string{realTemp + "/2:/tmp"}) cr.CleanupDirs() + checkEmpty() } { i = 0 - cr.ContainerRecord.Mounts = make(map[string]Mount) - cr.ContainerRecord.Mounts["/keeptmp"] = Mount{Kind: "collection", Writable: true} + cr.Container.Mounts = map[string]arvados.Mount{ + "/keeptmp": {Kind: "collection", Writable: true}, + } cr.OutputPath = "/keeptmp" - os.MkdirAll("/tmp/mktmpdir1/tmp0", os.ModePerm) + os.MkdirAll(realTemp+"/keep1/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", realTemp + "/keep1"}) + c.Check(cr.Binds, DeepEquals, []string{realTemp + "/keep1/tmp0:/keeptmp"}) + cr.CleanupDirs() + checkEmpty() + } + + { + i = 0 + cr.Container.Mounts = map[string]arvados.Mount{ + "/keepinp": {Kind: "collection", PortableDataHash: "59389a8f9ee9d399be35462a0f92541c+53"}, + "/keepout": {Kind: "collection", Writable: true}, + } + cr.OutputPath = "/keepout" + + os.MkdirAll(realTemp+"/keep1/by_id/59389a8f9ee9d399be35462a0f92541c+53", os.ModePerm) + os.MkdirAll(realTemp+"/keep1/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"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + sort.StringSlice(cr.Binds).Sort() + c.Check(cr.Binds, DeepEquals, []string{realTemp + "/keep1/by_id/59389a8f9ee9d399be35462a0f92541c+53:/keepinp:ro", + realTemp + "/keep1/tmp0:/keepout"}) cr.CleanupDirs() + checkEmpty() } { i = 0 - cr.ContainerRecord.Mounts = make(map[string]Mount) - cr.ContainerRecord.Mounts["/keepinp"] = Mount{Kind: "collection", PortableDataHash: "59389a8f9ee9d399be35462a0f92541c+53"} - cr.ContainerRecord.Mounts["/keepout"] = Mount{Kind: "collection", Writable: true} + cr.Container.RuntimeConstraints.KeepCacheRAM = 512 + cr.Container.Mounts = map[string]arvados.Mount{ + "/keepinp": {Kind: "collection", PortableDataHash: "59389a8f9ee9d399be35462a0f92541c+53"}, + "/keepout": {Kind: "collection", Writable: true}, + } cr.OutputPath = "/keepout" - os.MkdirAll("/tmp/mktmpdir1/by_id/59389a8f9ee9d399be35462a0f92541c+53", os.ModePerm) - os.MkdirAll("/tmp/mktmpdir1/tmp0", os.ModePerm) + os.MkdirAll(realTemp+"/keep1/by_id/59389a8f9ee9d399be35462a0f92541c+53", os.ModePerm) + os.MkdirAll(realTemp+"/keep1/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"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + sort.StringSlice(cr.Binds).Sort() + c.Check(cr.Binds, DeepEquals, []string{realTemp + "/keep1/by_id/59389a8f9ee9d399be35462a0f92541c+53:/keepinp:ro", + realTemp + "/keep1/tmp0:/keepout"}) cr.CleanupDirs() + checkEmpty() + } + + for _, test := range []struct { + in interface{} + out string + }{ + {in: "foo", out: `"foo"`}, + {in: nil, out: `null`}, + {in: map[string]int{"foo": 123}, out: `{"foo":123}`}, + } { + i = 0 + cr.Container.Mounts = map[string]arvados.Mount{ + "/mnt/test.json": {Kind: "json", Content: test.in}, + } + err := cr.SetupMounts() + c.Check(err, IsNil) + sort.StringSlice(cr.Binds).Sort() + c.Check(cr.Binds, DeepEquals, []string{realTemp + "/2/mountdata.json:/mnt/test.json:ro"}) + content, err := ioutil.ReadFile(realTemp + "/2/mountdata.json") + c.Check(err, IsNil) + c.Check(content, DeepEquals, []byte(test.out)) + cr.CleanupDirs() + checkEmpty() } } 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 += `}` + helperRecord := `{ + "command": ["/bin/sh", "-c", "echo $FROBIZ"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": "/bin", + "environment": {"FROBIZ": "bilbo"}, + "mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "file", "path": "/tmp/a/b/c.out"} }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} + }` api, _ := FullRunHelper(c, helperRecord, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) @@ -751,23 +906,22 @@ func (s *TestSuite) TestStdout(c *C) { t.finish <- dockerclient.WaitResult{ExitCode: 0} }) - c.Check(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.Content[2]["collection"].(arvadosclient.Dict)["manifest_text"], Equals, "./a/b 307372fa8fd5c146b22ae7a45b49bc31+6 0:6:c.out\n") + c.Check(api.CalledWith("container.exit_code", 0), NotNil) + c.Check(api.CalledWith("container.state", "Complete"), NotNil) + c.Check(api.CalledWith("collection.manifest_text", "./a/b 307372fa8fd5c146b22ae7a45b49bc31+6 0:6:c.out\n"), NotNil) } // Used by the TestStdoutWithWrongPath*() func StdoutErrorRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner, err error) { - 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} + api = &ArvTestClient{Container: rec} cr = NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") am := &ArvMountCmdLine{} cr.RunArvMount = am.ArvMountTest @@ -805,3 +959,50 @@ func (s *TestSuite) TestStdoutWithWrongKindCollection(c *C) { c.Check(err, NotNil) c.Check(strings.Contains(err.Error(), "Unsupported mount kind 'collection' for stdout"), Equals, true) } + +func (s *TestSuite) TestFullRunWithAPI(c *C) { + os.Setenv("ARVADOS_API_HOST", "test.arvados.org") + defer os.Unsetenv("ARVADOS_API_HOST") + api, _ := FullRunHelper(c, `{ + "command": ["/bin/sh", "-c", "echo $ARVADOS_API_HOST"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": "/bin", + "environment": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {"API": true} +}`, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, t.env[1][17:]+"\n")) + t.logWriter.Close() + t.finish <- dockerclient.WaitResult{ExitCode: 0} + }) + + c.Check(api.CalledWith("container.exit_code", 0), NotNil) + c.Check(api.CalledWith("container.state", "Complete"), NotNil) + c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "test.arvados.org\n"), Equals, true) + c.Check(api.CalledWith("container.output", "d41d8cd98f00b204e9800998ecf8427e+0"), NotNil) +} + +func (s *TestSuite) TestFullRunSetOutput(c *C) { + os.Setenv("ARVADOS_API_HOST", "test.arvados.org") + defer os.Unsetenv("ARVADOS_API_HOST") + api, _ := FullRunHelper(c, `{ + "command": ["/bin/sh", "-c", "echo $ARVADOS_API_HOST"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": "/bin", + "environment": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {"API": true} +}`, func(t *TestDockerClient) { + t.api.Container.Output = "d4ab34d3d4f8a72f5c4973051ae69fab+122" + t.logWriter.Close() + t.finish <- dockerclient.WaitResult{ExitCode: 0} + }) + + c.Check(api.CalledWith("container.exit_code", 0), NotNil) + c.Check(api.CalledWith("container.state", "Complete"), NotNil) + c.Check(api.CalledWith("container.output", "d4ab34d3d4f8a72f5c4973051ae69fab+122"), NotNil) +}