X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5bc52dbe43040297c622900797c55e686b377e9b..312137098ee5c5384db59e49d69163cbeb8a48b8:/services/crunch-run/crunchrun_test.go diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go index 5e77d7bd7b..8ee462586d 100644 --- a/services/crunch-run/crunchrun_test.go +++ b/services/crunch-run/crunchrun_test.go @@ -7,7 +7,6 @@ package main import ( "bufio" "bytes" - "context" "crypto/md5" "encoding/json" "errors" @@ -17,7 +16,6 @@ import ( "net" "os" "os/exec" - "path/filepath" "runtime/pprof" "sort" "strings" @@ -28,7 +26,9 @@ import ( "git.curoverse.com/arvados.git/sdk/go/arvados" "git.curoverse.com/arvados.git/sdk/go/arvadosclient" + "git.curoverse.com/arvados.git/sdk/go/arvadostest" "git.curoverse.com/arvados.git/sdk/go/manifest" + "golang.org/x/net/context" dockertypes "github.com/docker/docker/api/types" dockercontainer "github.com/docker/docker/api/types/container" @@ -41,17 +41,26 @@ func TestCrunchExec(t *testing.T) { TestingT(t) } -type TestSuite struct{} - // Gocheck boilerplate var _ = Suite(&TestSuite{}) +type TestSuite struct { + client *arvados.Client + docker *TestDockerClient +} + +func (s *TestSuite) SetUpTest(c *C) { + s.client = arvados.NewClientFromEnv() + s.docker = NewTestDockerClient() +} + type ArvTestClient struct { Total int64 Calls int Content []arvadosclient.Dict arvados.Container - Logs map[string]*bytes.Buffer + secretMounts []byte + Logs map[string]*bytes.Buffer sync.Mutex WasSetRunning bool callraw bool @@ -87,18 +96,18 @@ type TestDockerClient struct { logReader io.ReadCloser logWriter io.WriteCloser fn func(t *TestDockerClient) - finish int + exitCode int stop chan bool cwd string env []string api *ArvTestClient realTemp string + calledWait bool } -func NewTestDockerClient(exitCode int) *TestDockerClient { +func NewTestDockerClient() *TestDockerClient { t := &TestDockerClient{} t.logReader, t.logWriter = io.Pipe() - t.finish = exitCode t.stop = make(chan bool, 1) t.cwd = "/" return t @@ -130,31 +139,48 @@ func (t *TestDockerClient) ContainerCreate(ctx context.Context, config *dockerco } func (t *TestDockerClient) ContainerStart(ctx context.Context, container string, options dockertypes.ContainerStartOptions) error { + if t.exitCode == 3 { + return errors.New(`Error response from daemon: oci runtime error: container_linux.go:247: starting container process caused "process_linux.go:359: container init caused \"rootfs_linux.go:54: mounting \\\"/tmp/keep453790790/by_id/99999999999999999999999999999999+99999/myGenome\\\" to rootfs \\\"/tmp/docker/overlay2/9999999999999999999999999999999999999999999999999999999999999999/merged\\\" at \\\"/tmp/docker/overlay2/9999999999999999999999999999999999999999999999999999999999999999/merged/keep/99999999999999999999999999999999+99999/myGenome\\\" caused \\\"no such file or directory\\\"\""`) + } + if t.exitCode == 4 { + return errors.New(`panic: standard_init_linux.go:175: exec user process caused "no such file or directory"`) + } + if t.exitCode == 5 { + return errors.New(`Error response from daemon: Cannot start container 41f26cbc43bcc1280f4323efb1830a394ba8660c9d1c2b564ba42bf7f7694845: [8] System error: no such file or directory`) + } + if t.exitCode == 6 { + return errors.New(`Error response from daemon: Cannot start container 58099cd76c834f3dc2a4fb76c8028f049ae6d4fdf0ec373e1f2cfea030670c2d: [8] System error: exec: "foobar": executable file not found in $PATH`) + } + if container == "abcde" { - go t.fn(t) + // t.fn gets executed in ContainerWait return nil } else { return errors.New("Invalid container id") } } -func (t *TestDockerClient) ContainerStop(ctx context.Context, container string, timeout *time.Duration) error { +func (t *TestDockerClient) ContainerRemove(ctx context.Context, container string, options dockertypes.ContainerRemoveOptions) error { t.stop <- true return nil } func (t *TestDockerClient) ContainerWait(ctx context.Context, container string, condition dockercontainer.WaitCondition) (<-chan dockercontainer.ContainerWaitOKBody, <-chan error) { - body := make(chan dockercontainer.ContainerWaitOKBody) + t.calledWait = true + body := make(chan dockercontainer.ContainerWaitOKBody, 1) err := make(chan error) go func() { - body <- dockercontainer.ContainerWaitOKBody{StatusCode: int64(t.finish)} - close(body) - close(err) + t.fn(t) + body <- dockercontainer.ContainerWaitOKBody{StatusCode: int64(t.exitCode)} }() return body, err } func (t *TestDockerClient) ImageInspectWithRaw(ctx context.Context, image string) (dockertypes.ImageInspect, []byte, error) { + if t.exitCode == 2 { + return dockertypes.ImageInspect{}, nil, fmt.Errorf("Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?") + } + if t.imageLoaded == image { return dockertypes.ImageInspect{}, nil, nil } else { @@ -163,6 +189,9 @@ func (t *TestDockerClient) ImageInspectWithRaw(ctx context.Context, image string } func (t *TestDockerClient) ImageLoad(ctx context.Context, input io.Reader, quiet bool) (dockertypes.ImageLoadResponse, error) { + if t.exitCode == 2 { + return dockertypes.ImageLoadResponse{}, fmt.Errorf("Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?") + } _, err := io.Copy(ioutil.Discard, input) if err != nil { return dockertypes.ImageLoadResponse{}, err @@ -214,6 +243,12 @@ func (client *ArvTestClient) Call(method, resourceType, uuid, action string, par "uuid": "`+fakeAuthUUID+`", "api_token": "`+fakeAuthToken+`" }`), output) + case method == "GET" && resourceType == "containers" && action == "secret_mounts": + if client.secretMounts != nil { + return json.Unmarshal(client.secretMounts, output) + } else { + return json.Unmarshal([]byte(`{"secret_mounts":{}}`), output) + } default: return fmt.Errorf("Not found") } @@ -222,8 +257,23 @@ func (client *ArvTestClient) Call(method, resourceType, uuid, action string, par func (client *ArvTestClient) CallRaw(method, resourceType, uuid, action string, parameters arvadosclient.Dict) (reader io.ReadCloser, err error) { var j []byte - if method == "GET" && resourceType == "containers" && action == "" && !client.callraw { - j, err = json.Marshal(client.Container) + if method == "GET" && resourceType == "nodes" && uuid == "" && action == "" { + j = []byte(`{ + "kind": "arvados#nodeList", + "items": [{ + "uuid": "zzzzz-7ekkf-2z3mc76g2q73aio", + "hostname": "compute2", + "properties": {"total_cpu_cores": 16} + }]}`) + } else if method == "GET" && resourceType == "containers" && action == "" && !client.callraw { + if uuid == "" { + j, err = json.Marshal(map[string]interface{}{ + "items": []interface{}{client.Container}, + "kind": "arvados#nodeList", + }) + } else { + j, err = json.Marshal(client.Container) + } } else { j = []byte(`{ "command": ["sleep", "1"], @@ -307,12 +357,20 @@ call: return nil } -func (client *KeepTestClient) PutHB(hash string, buf []byte) (string, int, error) { +func (client *KeepTestClient) PutB(buf []byte) (string, int, error) { client.Content = buf - return fmt.Sprintf("%s+%d", hash, len(buf)), len(buf), nil + return fmt.Sprintf("%x+%d", md5.Sum(buf), len(buf)), len(buf), nil +} + +func (client *KeepTestClient) ReadAt(string, []byte, int) (int, error) { + return 0, errors.New("not implemented") } -func (*KeepTestClient) ClearBlockCache() { +func (client *KeepTestClient) ClearBlockCache() { +} + +func (client *KeepTestClient) Close() { + client.Content = nil } type FileWrapper struct { @@ -320,11 +378,27 @@ type FileWrapper struct { len int64 } +func (fw FileWrapper) Readdir(n int) ([]os.FileInfo, error) { + return nil, errors.New("not implemented") +} + +func (fw FileWrapper) Seek(int64, int) (int64, error) { + return 0, errors.New("not implemented") +} + func (fw FileWrapper) Size() int64 { return fw.len } -func (fw FileWrapper) Seek(int64, int) (int64, error) { +func (fw FileWrapper) Stat() (os.FileInfo, error) { + return nil, errors.New("not implemented") +} + +func (fw FileWrapper) Truncate(int64) error { + return errors.New("not implemented") +} + +func (fw FileWrapper) Write([]byte) (int, error) { return 0, errors.New("not implemented") } @@ -343,10 +417,12 @@ func (client *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename s func (s *TestSuite) TestLoadImage(c *C) { kc := &KeepTestClient{} - docker := NewTestDockerClient(0) - cr := NewContainerRunner(&ArvTestClient{}, kc, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + defer kc.Close() + cr, err := NewContainerRunner(s.client, &ArvTestClient{}, kc, s.docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) - _, err := cr.Docker.ImageRemove(nil, hwImageId, dockertypes.ImageRemoveOptions{}) + _, err = cr.Docker.ImageRemove(nil, hwImageId, dockertypes.ImageRemoveOptions{}) + c.Check(err, IsNil) _, _, err = cr.Docker.ImageInspectWithRaw(nil, hwImageId) c.Check(err, NotNil) @@ -410,42 +486,34 @@ 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") +type KeepErrorTestClient struct { + KeepTestClient } -func (KeepErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (arvados.File, error) { +func (*KeepErrorTestClient) ManifestFileReader(manifest.Manifest, string) (arvados.File, error) { return nil, errors.New("KeepError") } -func (KeepErrorTestClient) ClearBlockCache() { +func (*KeepErrorTestClient) PutB(buf []byte) (string, int, error) { + return "", 0, errors.New("KeepError") } -type KeepReadErrorTestClient struct{} - -func (KeepReadErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) { - return "", 0, nil +type KeepReadErrorTestClient struct { + KeepTestClient } -func (KeepReadErrorTestClient) ClearBlockCache() { +func (*KeepReadErrorTestClient) ReadAt(string, []byte, int) (int, error) { + return 0, errors.New("KeepError") } -type ErrorReader struct{} +type ErrorReader struct { + FileWrapper +} func (ErrorReader) Read(p []byte) (n int, err error) { return 0, errors.New("ErrorReader") } -func (ErrorReader) Close() error { - return nil -} - -func (ErrorReader) Size() int64 { - return 0 -} - func (ErrorReader) Seek(int64, int) (int64, error) { return 0, errors.New("ErrorReader") } @@ -456,39 +524,44 @@ func (KeepReadErrorTestClient) ManifestFileReader(m manifest.Manifest, filename func (s *TestSuite) TestLoadImageArvError(c *C) { // (1) Arvados error - cr := NewContainerRunner(ArvErrorTestClient{}, &KeepTestClient{}, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + kc := &KeepTestClient{} + defer kc.Close() + cr, err := NewContainerRunner(s.client, ArvErrorTestClient{}, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.Container.ContainerImage = hwPDH - err := cr.LoadImage() + err = cr.LoadImage() c.Check(err.Error(), Equals, "While getting container image collection: ArvError") } func (s *TestSuite) TestLoadImageKeepError(c *C) { // (2) Keep error - docker := NewTestDockerClient(0) - cr := NewContainerRunner(&ArvTestClient{}, KeepErrorTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + cr, err := NewContainerRunner(s.client, &ArvTestClient{}, &KeepErrorTestClient{}, s.docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.Container.ContainerImage = hwPDH - err := cr.LoadImage() + err = cr.LoadImage() + c.Assert(err, NotNil) 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, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + cr, err := NewContainerRunner(s.client, &ArvTestClient{}, &KeepReadErrorTestClient{}, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.Container.ContainerImage = otherPDH - err := cr.LoadImage() + err = cr.LoadImage() 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(0) - cr := NewContainerRunner(&ArvTestClient{}, KeepReadErrorTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + cr, err := NewContainerRunner(s.client, &ArvTestClient{}, &KeepReadErrorTestClient{}, s.docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.Container.ContainerImage = hwPDH - err := cr.LoadImage() + err = cr.LoadImage() c.Check(err, NotNil) } @@ -505,14 +578,14 @@ type TestLogs struct { Stderr ClosableBuffer } -func (tl *TestLogs) NewTestLoggingWriter(logstr string) io.WriteCloser { +func (tl *TestLogs) NewTestLoggingWriter(logstr string) (io.WriteCloser, error) { if logstr == "stdout" { - return &tl.Stdout + return &tl.Stdout, nil } if logstr == "stderr" { - return &tl.Stderr + return &tl.Stderr, nil } - return nil + return nil, errors.New("???") } func dockerLog(fd byte, msg string) []byte { @@ -525,18 +598,20 @@ func dockerLog(fd byte, msg string) []byte { } func (s *TestSuite) TestRunContainer(c *C) { - docker := NewTestDockerClient(0) - docker.fn = func(t *TestDockerClient) { + s.docker.fn = func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, "Hello world\n")) t.logWriter.Close() } - cr := NewContainerRunner(&ArvTestClient{}, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + kc := &KeepTestClient{} + defer kc.Close() + cr, err := NewContainerRunner(s.client, &ArvTestClient{}, kc, s.docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) var logs TestLogs cr.NewLogWriter = logs.NewTestLoggingWriter cr.Container.ContainerImage = hwPDH cr.Container.Command = []string{"./hw"} - err := cr.LoadImage() + err = cr.LoadImage() c.Check(err, IsNil) err = cr.CreateContainer() @@ -555,14 +630,16 @@ func (s *TestSuite) TestRunContainer(c *C) { func (s *TestSuite) TestCommitLogs(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} - cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + defer kc.Close() + cr, err := NewContainerRunner(s.client, api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.CrunchLog.Timestamper = (&TestTimestamper{}).Timestamp cr.CrunchLog.Print("Hello world!") cr.CrunchLog.Print("Goodbye") cr.finalState = "Complete" - err := cr.CommitLogs() + err = cr.CommitLogs() c.Check(err, IsNil) c.Check(api.Calls, Equals, 2) @@ -575,9 +652,11 @@ func (s *TestSuite) TestCommitLogs(c *C) { func (s *TestSuite) TestUpdateContainerRunning(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} - cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + defer kc.Close() + cr, err := NewContainerRunner(s.client, api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) - err := cr.UpdateContainerRunning() + err = cr.UpdateContainerRunning() c.Check(err, IsNil) c.Check(api.Content[0]["container"].(arvadosclient.Dict)["state"], Equals, "Running") @@ -586,7 +665,9 @@ func (s *TestSuite) TestUpdateContainerRunning(c *C) { func (s *TestSuite) TestUpdateContainerComplete(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} - cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + defer kc.Close() + cr, err := NewContainerRunner(s.client, api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.LogsPDH = new(string) *cr.LogsPDH = "d3a229d2fe3690c2c3e75a71a153c6a3+60" @@ -595,7 +676,7 @@ func (s *TestSuite) TestUpdateContainerComplete(c *C) { *cr.ExitCode = 42 cr.finalState = "Complete" - err := cr.UpdateContainerFinal() + err = cr.UpdateContainerFinal() c.Check(err, IsNil) c.Check(api.Content[0]["container"].(arvadosclient.Dict)["log"], Equals, *cr.LogsPDH) @@ -606,11 +687,13 @@ func (s *TestSuite) TestUpdateContainerComplete(c *C) { func (s *TestSuite) TestUpdateContainerCancelled(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} - cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + defer kc.Close() + cr, err := NewContainerRunner(s.client, api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.cCancelled = true cr.finalState = "Cancelled" - err := cr.UpdateContainerFinal() + err = cr.UpdateContainerFinal() c.Check(err, IsNil) c.Check(api.Content[0]["container"].(arvadosclient.Dict)["log"], IsNil) @@ -620,18 +703,30 @@ func (s *TestSuite) TestUpdateContainerCancelled(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, extraMounts []string, exitCode int, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner, realTemp string) { +func (s *TestSuite) fullRunHelper(c *C, record string, extraMounts []string, exitCode int, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner, realTemp string) { rec := arvados.Container{} err := json.Unmarshal([]byte(record), &rec) c.Check(err, IsNil) - docker := NewTestDockerClient(exitCode) - docker.fn = fn - docker.ImageRemove(nil, hwImageId, dockertypes.ImageRemoveOptions{}) + var sm struct { + SecretMounts map[string]arvados.Mount `json:"secret_mounts"` + } + err = json.Unmarshal([]byte(record), &sm) + c.Check(err, IsNil) + secretMounts, err := json.Marshal(sm) + c.Logf("%s %q", sm, secretMounts) + c.Check(err, IsNil) + + s.docker.exitCode = exitCode + s.docker.fn = fn + s.docker.ImageRemove(nil, hwImageId, dockertypes.ImageRemoveOptions{}) api = &ArvTestClient{Container: rec} - docker.api = api - cr = NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + s.docker.api = api + kc := &KeepTestClient{} + defer kc.Close() + cr, err = NewContainerRunner(s.client, api, kc, s.docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.statInterval = 100 * time.Millisecond am := &ArvMountCmdLine{} cr.RunArvMount = am.ArvMountTest @@ -640,7 +735,7 @@ func FullRunHelper(c *C, record string, extraMounts []string, exitCode int, fn f c.Assert(err, IsNil) defer os.RemoveAll(realTemp) - docker.realTemp = realTemp + s.docker.realTemp = realTemp tempcount := 0 cr.MkTempDir = func(_ string, prefix string) (string, error) { @@ -653,6 +748,9 @@ func FullRunHelper(c *C, record string, extraMounts []string, exitCode int, fn f } return d, err } + cr.MkArvClient = func(token string) (IArvadosClient, error) { + return &ArvTestClient{secretMounts: secretMounts}, nil + } if extraMounts != nil && len(extraMounts) > 0 { err := cr.SetupArvMountPoint("keep") @@ -667,9 +765,10 @@ func FullRunHelper(c *C, record string, extraMounts []string, exitCode int, fn f if api.CalledWith("container.state", "Complete") != nil { c.Check(err, IsNil) } - c.Check(api.WasSetRunning, Equals, true) - - c.Check(api.Content[api.Calls-1]["container"].(arvadosclient.Dict)["log"], NotNil) + if exitCode != 2 { + c.Check(api.WasSetRunning, Equals, true) + c.Check(api.Content[api.Calls-2]["container"].(arvadosclient.Dict)["log"], NotNil) + } if err != nil { for k, v := range api.Logs { @@ -682,7 +781,7 @@ func FullRunHelper(c *C, record string, extraMounts []string, exitCode int, fn f } func (s *TestSuite) TestFullRunHello(c *C) { - api, _, _ := FullRunHelper(c, `{ + api, _, _ := s.fullRunHelper(c, `{ "command": ["echo", "hello world"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -703,7 +802,7 @@ func (s *TestSuite) TestFullRunHello(c *C) { } func (s *TestSuite) TestCrunchstat(c *C) { - api, _, _ := FullRunHelper(c, `{ + api, _, _ := s.fullRunHelper(c, `{ "command": ["sleep", "1"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -735,7 +834,8 @@ func (s *TestSuite) TestCrunchstat(c *C) { } func (s *TestSuite) TestNodeInfoLog(c *C) { - api, _, _ := FullRunHelper(c, `{ + os.Setenv("SLURMD_NODENAME", "compute2") + api, _, _ := s.fullRunHelper(c, `{ "command": ["sleep", "1"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -753,16 +853,23 @@ func (s *TestSuite) TestNodeInfoLog(c *C) { c.Check(api.CalledWith("container.exit_code", 0), NotNil) c.Check(api.CalledWith("container.state", "Complete"), NotNil) + c.Assert(api.Logs["node"], NotNil) + json := api.Logs["node"].String() + c.Check(json, Matches, `(?ms).*"uuid": *"zzzzz-7ekkf-2z3mc76g2q73aio".*`) + c.Check(json, Matches, `(?ms).*"total_cpu_cores": *16.*`) + c.Check(json, Not(Matches), `(?ms).*"info":.*`) + c.Assert(api.Logs["node-info"], NotNil) - c.Check(api.Logs["node-info"].String(), Matches, `(?ms).*Host Information.*`) - c.Check(api.Logs["node-info"].String(), Matches, `(?ms).*CPU Information.*`) - c.Check(api.Logs["node-info"].String(), Matches, `(?ms).*Memory Information.*`) - c.Check(api.Logs["node-info"].String(), Matches, `(?ms).*Disk Space.*`) - c.Check(api.Logs["node-info"].String(), Matches, `(?ms).*Disk INodes.*`) + json = api.Logs["node-info"].String() + c.Check(json, Matches, `(?ms).*Host Information.*`) + c.Check(json, Matches, `(?ms).*CPU Information.*`) + c.Check(json, Matches, `(?ms).*Memory Information.*`) + c.Check(json, Matches, `(?ms).*Disk Space.*`) + c.Check(json, Matches, `(?ms).*Disk INodes.*`) } func (s *TestSuite) TestContainerRecordLog(c *C) { - api, _, _ := FullRunHelper(c, `{ + api, _, _ := s.fullRunHelper(c, `{ "command": ["sleep", "1"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -785,7 +892,7 @@ func (s *TestSuite) TestContainerRecordLog(c *C) { } func (s *TestSuite) TestFullRunStderr(c *C) { - api, _, _ := FullRunHelper(c, `{ + api, _, _ := s.fullRunHelper(c, `{ "command": ["/bin/sh", "-c", "echo hello ; echo world 1>&2 ; exit 1"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -810,7 +917,7 @@ func (s *TestSuite) TestFullRunStderr(c *C) { } func (s *TestSuite) TestFullRunDefaultCwd(c *C) { - api, _, _ := FullRunHelper(c, `{ + api, _, _ := s.fullRunHelper(c, `{ "command": ["pwd"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -831,7 +938,7 @@ func (s *TestSuite) TestFullRunDefaultCwd(c *C) { } func (s *TestSuite) TestFullRunSetCwd(c *C) { - api, _, _ := FullRunHelper(c, `{ + api, _, _ := s.fullRunHelper(c, `{ "command": ["pwd"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": "/bin", @@ -853,7 +960,7 @@ func (s *TestSuite) TestFullRunSetCwd(c *C) { func (s *TestSuite) TestStopOnSignal(c *C) { s.testStopContainer(c, func(cr *ContainerRunner) { go func() { - for !cr.cStarted { + for !s.docker.calledWait { time.Sleep(time.Millisecond) } cr.SigChan <- syscall.SIGINT @@ -887,17 +994,22 @@ func (s *TestSuite) testStopContainer(c *C, setup func(cr *ContainerRunner)) { err := json.Unmarshal([]byte(record), &rec) c.Check(err, IsNil) - docker := NewTestDockerClient(0) - docker.fn = func(t *TestDockerClient) { + s.docker.fn = func(t *TestDockerClient) { <-t.stop t.logWriter.Write(dockerLog(1, "foo\n")) t.logWriter.Close() } - docker.ImageRemove(nil, hwImageId, dockertypes.ImageRemoveOptions{}) + s.docker.ImageRemove(nil, hwImageId, dockertypes.ImageRemoveOptions{}) api := &ArvTestClient{Container: rec} - cr := NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + kc := &KeepTestClient{} + defer kc.Close() + cr, err := NewContainerRunner(s.client, api, kc, s.docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.RunArvMount = func([]string, string) (*exec.Cmd, error) { return nil, nil } + cr.MkArvClient = func(token string) (IArvadosClient, error) { + return &ArvTestClient{}, nil + } setup(cr) done := make(chan error) @@ -918,11 +1030,11 @@ func (s *TestSuite) testStopContainer(c *C, setup func(cr *ContainerRunner)) { 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) + c.Check(api.Logs["stdout"].String(), Matches, "(?ms).*foo\n$") } func (s *TestSuite) TestFullRunSetEnv(c *C) { - api, _, _ := FullRunHelper(c, `{ + api, _, _ := s.fullRunHelper(c, `{ "command": ["/bin/sh", "-c", "echo $FROBIZ"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": "/bin", @@ -963,7 +1075,9 @@ func stubCert(temp string) string { func (s *TestSuite) TestSetupMounts(c *C) { api := &ArvTestClient{} kc := &KeepTestClient{} - cr := NewContainerRunner(api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + defer kc.Close() + cr, err := NewContainerRunner(s.client, api, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) am := &ArvMountCmdLine{} cr.RunArvMount = am.ArvMountTest @@ -973,6 +1087,8 @@ func (s *TestSuite) TestSetupMounts(c *C) { c.Assert(err, IsNil) stubCertPath := stubCert(certTemp) + cr.parentTemp = realTemp + defer os.RemoveAll(realTemp) defer os.RemoveAll(certTemp) @@ -989,11 +1105,12 @@ func (s *TestSuite) TestSetupMounts(c *C) { } checkEmpty := func() { - filepath.Walk(realTemp, func(path string, _ os.FileInfo, err error) error { - c.Check(path, Equals, realTemp) - c.Check(err, IsNil) - return nil - }) + // Should be deleted. + _, err := os.Stat(realTemp) + c.Assert(os.IsNotExist(err), Equals, true) + + // Now recreate it for the next test. + c.Assert(os.Mkdir(realTemp, 0777), IsNil) } { @@ -1002,11 +1119,14 @@ func (s *TestSuite) TestSetupMounts(c *C) { cr.Container.Mounts = make(map[string]arvados.Mount) cr.Container.Mounts["/tmp"] = arvados.Mount{Kind: "tmp"} cr.OutputPath = "/tmp" - + cr.statInterval = 5 * time.Second err := cr.SetupMounts() c.Check(err, IsNil) - 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"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(cr.Binds, DeepEquals, []string{realTemp + "/tmp2:/tmp"}) + os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() checkEmpty() } @@ -1021,8 +1141,11 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, IsNil) - 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:/out", realTemp + "/3:/tmp"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(cr.Binds, DeepEquals, []string{realTemp + "/tmp2:/out", realTemp + "/tmp3:/tmp"}) + os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() checkEmpty() } @@ -1039,8 +1162,11 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, IsNil) - 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", stubCertPath + ":/etc/arvados/ca-certificates.crt:ro"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(cr.Binds, DeepEquals, []string{realTemp + "/tmp2:/tmp", stubCertPath + ":/etc/arvados/ca-certificates.crt:ro"}) + os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() checkEmpty() @@ -1059,8 +1185,11 @@ func (s *TestSuite) TestSetupMounts(c *C) { 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(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) c.Check(cr.Binds, DeepEquals, []string{realTemp + "/keep1/tmp0:/keeptmp"}) + os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() checkEmpty() } @@ -1079,10 +1208,13 @@ func (s *TestSuite) TestSetupMounts(c *C) { 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(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--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"}) + os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() checkEmpty() } @@ -1102,10 +1234,13 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, IsNil) - c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--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"}) + os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() checkEmpty() } @@ -1126,10 +1261,40 @@ func (s *TestSuite) TestSetupMounts(c *C) { 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(cr.Binds, DeepEquals, []string{realTemp + "/json2/mountdata.json:/mnt/test.json:ro"}) + content, err := ioutil.ReadFile(realTemp + "/json2/mountdata.json") c.Check(err, IsNil) c.Check(content, DeepEquals, []byte(test.out)) + os.RemoveAll(cr.ArvMountPoint) + cr.CleanupDirs() + checkEmpty() + } + + for _, test := range []struct { + in interface{} + out string + }{ + {in: "foo", out: `foo`}, + {in: nil, out: "error"}, + {in: map[string]int64{"foo": 123456789123456789}, out: "error"}, + } { + i = 0 + cr.ArvMountPoint = "" + cr.Container.Mounts = map[string]arvados.Mount{ + "/mnt/test.txt": {Kind: "text", Content: test.in}, + } + err := cr.SetupMounts() + if test.out == "error" { + c.Check(err.Error(), Equals, "content for mount \"/mnt/test.txt\" must be a string") + } else { + c.Check(err, IsNil) + sort.StringSlice(cr.Binds).Sort() + c.Check(cr.Binds, DeepEquals, []string{realTemp + "/text2/mountdata.text:/mnt/test.txt:ro"}) + content, err := ioutil.ReadFile(realTemp + "/text2/mountdata.text") + c.Check(err, IsNil) + c.Check(content, DeepEquals, []byte(test.out)) + } + os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() checkEmpty() } @@ -1149,26 +1314,46 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, IsNil) - c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", "--read-write", "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) - c.Check(cr.Binds, DeepEquals, []string{realTemp + "/2:/tmp", realTemp + "/keep1/tmp0:/tmp/foo:ro"}) + c.Check(am.Cmd, DeepEquals, []string{"--foreground", "--allow-other", + "--read-write", "--crunchstat-interval=5", + "--file-cache", "512", "--mount-tmp", "tmp0", "--mount-by-pdh", "by_id", realTemp + "/keep1"}) + c.Check(cr.Binds, DeepEquals, []string{realTemp + "/tmp2:/tmp", realTemp + "/keep1/tmp0:/tmp/foo:ro"}) + os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() checkEmpty() } - // Writable mount points are not allowed underneath output_dir mount point + // Writable mount points copied to output_dir mount point { i = 0 cr.ArvMountPoint = "" cr.Container.Mounts = make(map[string]arvados.Mount) cr.Container.Mounts = map[string]arvados.Mount{ - "/tmp": {Kind: "tmp"}, - "/tmp/foo": {Kind: "collection", Writable: true}, + "/tmp": {Kind: "tmp"}, + "/tmp/foo": {Kind: "collection", + PortableDataHash: "59389a8f9ee9d399be35462a0f92541c+53", + Writable: true}, + "/tmp/bar": {Kind: "collection", + PortableDataHash: "59389a8f9ee9d399be35462a0f92541d+53", + Path: "baz", + Writable: true}, } cr.OutputPath = "/tmp" + os.MkdirAll(realTemp+"/keep1/by_id/59389a8f9ee9d399be35462a0f92541c+53", os.ModePerm) + os.MkdirAll(realTemp+"/keep1/by_id/59389a8f9ee9d399be35462a0f92541d+53/baz", os.ModePerm) + + rf, _ := os.Create(realTemp + "/keep1/by_id/59389a8f9ee9d399be35462a0f92541d+53/baz/quux") + rf.Write([]byte("bar")) + rf.Close() + err := cr.SetupMounts() - c.Check(err, NotNil) - c.Check(err, ErrorMatches, `Writable mount points are not permitted underneath the output_path.*`) + c.Check(err, IsNil) + _, err = os.Stat(cr.HostOutputDir + "/foo") + c.Check(err, IsNil) + _, err = os.Stat(cr.HostOutputDir + "/bar/quux") + c.Check(err, IsNil) + os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() checkEmpty() } @@ -1180,13 +1365,14 @@ func (s *TestSuite) TestSetupMounts(c *C) { cr.Container.Mounts = make(map[string]arvados.Mount) cr.Container.Mounts = map[string]arvados.Mount{ "/tmp": {Kind: "tmp"}, - "/tmp/foo": {Kind: "json"}, + "/tmp/foo": {Kind: "tmp"}, } cr.OutputPath = "/tmp" err := cr.SetupMounts() c.Check(err, NotNil) - c.Check(err, ErrorMatches, `Only mount points of kind 'collection' are supported underneath the output_path.*`) + c.Check(err, ErrorMatches, `Only mount points of kind 'collection', 'text' or 'json' are supported underneath the output_path.*`) + os.RemoveAll(cr.ArvMountPoint) cr.CleanupDirs() checkEmpty() } @@ -1203,6 +1389,65 @@ func (s *TestSuite) TestSetupMounts(c *C) { err := cr.SetupMounts() c.Check(err, NotNil) c.Check(err, ErrorMatches, `Unsupported mount kind 'tmp' for stdin.*`) + os.RemoveAll(cr.ArvMountPoint) + cr.CleanupDirs() + checkEmpty() + } + + // git_tree mounts + { + i = 0 + cr.ArvMountPoint = "" + (*GitMountSuite)(nil).useTestGitServer(c) + cr.token = arvadostest.ActiveToken + cr.Container.Mounts = make(map[string]arvados.Mount) + cr.Container.Mounts = map[string]arvados.Mount{ + "/tip": { + Kind: "git_tree", + UUID: arvadostest.Repository2UUID, + Commit: "fd3531f42995344f36c30b79f55f27b502f3d344", + Path: "/", + }, + "/non-tip": { + Kind: "git_tree", + UUID: arvadostest.Repository2UUID, + Commit: "5ebfab0522851df01fec11ec55a6d0f4877b542e", + Path: "/", + }, + } + cr.OutputPath = "/tmp" + + err := cr.SetupMounts() + c.Check(err, IsNil) + + // dirMap[mountpoint] == tmpdir + dirMap := make(map[string]string) + for _, bind := range cr.Binds { + tokens := strings.Split(bind, ":") + dirMap[tokens[1]] = tokens[0] + + if cr.Container.Mounts[tokens[1]].Writable { + c.Check(len(tokens), Equals, 2) + } else { + c.Check(len(tokens), Equals, 3) + c.Check(tokens[2], Equals, "ro") + } + } + + data, err := ioutil.ReadFile(dirMap["/tip"] + "/dir1/dir2/file with mode 0644") + c.Check(err, IsNil) + c.Check(string(data), Equals, "\000\001\002\003") + _, err = ioutil.ReadFile(dirMap["/tip"] + "/file only on testbranch") + c.Check(err, FitsTypeOf, &os.PathError{}) + c.Check(os.IsNotExist(err), Equals, true) + + data, err = ioutil.ReadFile(dirMap["/non-tip"] + "/dir1/dir2/file with mode 0644") + c.Check(err, IsNil) + c.Check(string(data), Equals, "\000\001\002\003") + data, err = ioutil.ReadFile(dirMap["/non-tip"] + "/file only on testbranch") + c.Check(err, IsNil) + c.Check(string(data), Equals, "testfile\n") + cr.CleanupDirs() checkEmpty() } @@ -1220,7 +1465,7 @@ func (s *TestSuite) TestStdout(c *C) { "runtime_constraints": {} }` - api, _, _ := FullRunHelper(c, helperRecord, nil, 0, func(t *TestDockerClient) { + api, _, _ := s.fullRunHelper(c, helperRecord, nil, 0, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) t.logWriter.Close() }) @@ -1231,26 +1476,31 @@ func (s *TestSuite) TestStdout(c *C) { } // Used by the TestStdoutWithWrongPath*() -func StdoutErrorRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner, err error) { +func (s *TestSuite) 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(0) - docker.fn = fn - docker.ImageRemove(nil, hwImageId, dockertypes.ImageRemoveOptions{}) + s.docker.fn = fn + s.docker.ImageRemove(nil, hwImageId, dockertypes.ImageRemoveOptions{}) api = &ArvTestClient{Container: rec} - cr = NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + kc := &KeepTestClient{} + defer kc.Close() + cr, err = NewContainerRunner(s.client, api, kc, s.docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) am := &ArvMountCmdLine{} cr.RunArvMount = am.ArvMountTest + cr.MkArvClient = func(token string) (IArvadosClient, error) { + return &ArvTestClient{}, nil + } err = cr.Run() return } func (s *TestSuite) TestStdoutWithWrongPath(c *C) { - _, _, err := StdoutErrorRunHelper(c, `{ + _, _, err := s.stdoutErrorRunHelper(c, `{ "mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "file", "path":"/tmpa.out"} }, "output_path": "/tmp" }`, func(t *TestDockerClient) {}) @@ -1260,7 +1510,7 @@ func (s *TestSuite) TestStdoutWithWrongPath(c *C) { } func (s *TestSuite) TestStdoutWithWrongKindTmp(c *C) { - _, _, err := StdoutErrorRunHelper(c, `{ + _, _, err := s.stdoutErrorRunHelper(c, `{ "mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "tmp", "path":"/tmp/a.out"} }, "output_path": "/tmp" }`, func(t *TestDockerClient) {}) @@ -1270,7 +1520,7 @@ func (s *TestSuite) TestStdoutWithWrongKindTmp(c *C) { } func (s *TestSuite) TestStdoutWithWrongKindCollection(c *C) { - _, _, err := StdoutErrorRunHelper(c, `{ + _, _, err := s.stdoutErrorRunHelper(c, `{ "mounts": {"/tmp": {"kind": "tmp"}, "stdout": {"kind": "collection", "path":"/tmp/a.out"} }, "output_path": "/tmp" }`, func(t *TestDockerClient) {}) @@ -1280,9 +1530,9 @@ func (s *TestSuite) TestStdoutWithWrongKindCollection(c *C) { } func (s *TestSuite) TestFullRunWithAPI(c *C) { + defer os.Setenv("ARVADOS_API_HOST", os.Getenv("ARVADOS_API_HOST")) os.Setenv("ARVADOS_API_HOST", "test.arvados.org") - defer os.Unsetenv("ARVADOS_API_HOST") - api, _, _ := FullRunHelper(c, `{ + api, _, _ := s.fullRunHelper(c, `{ "command": ["/bin/sh", "-c", "echo $ARVADOS_API_HOST"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": "/bin", @@ -1303,9 +1553,9 @@ func (s *TestSuite) TestFullRunWithAPI(c *C) { } func (s *TestSuite) TestFullRunSetOutput(c *C) { + defer os.Setenv("ARVADOS_API_HOST", os.Getenv("ARVADOS_API_HOST")) os.Setenv("ARVADOS_API_HOST", "test.arvados.org") - defer os.Unsetenv("ARVADOS_API_HOST") - api, _, _ := FullRunHelper(c, `{ + api, _, _ := s.fullRunHelper(c, `{ "command": ["/bin/sh", "-c", "echo $ARVADOS_API_HOST"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": "/bin", @@ -1345,7 +1595,7 @@ func (s *TestSuite) TestStdoutWithExcludeFromOutputMountPointUnderOutputDir(c *C extraMounts := []string{"a3e8f74c6f101eae01fa08bfb4e49b3a+54"} - api, _, _ := FullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { + api, _, _ := s.fullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) t.logWriter.Close() }) @@ -1380,12 +1630,12 @@ func (s *TestSuite) TestStdoutWithMultipleMountPointsUnderOutputDir(c *C) { "a0def87f80dd594d4675809e83bd4f15+367/subdir1/subdir2/file2_in_subdir2.txt", } - api, runner, realtemp := FullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { + api, runner, realtemp := s.fullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) t.logWriter.Close() }) - c.Check(runner.Binds, DeepEquals, []string{realtemp + "/2:/tmp", + c.Check(runner.Binds, DeepEquals, []string{realtemp + "/tmp2:/tmp", realtemp + "/keep1/by_id/a0def87f80dd594d4675809e83bd4f15+367/file2_in_main.txt:/tmp/foo/bar:ro", realtemp + "/keep1/by_id/a0def87f80dd594d4675809e83bd4f15+367/subdir1/subdir2/file2_in_subdir2.txt:/tmp/foo/baz/sub2file2:ro", realtemp + "/keep1/by_id/a0def87f80dd594d4675809e83bd4f15+367/subdir1:/tmp/foo/sub1:ro", @@ -1402,7 +1652,7 @@ func (s *TestSuite) TestStdoutWithMultipleMountPointsUnderOutputDir(c *C) { manifest := collection["manifest_text"].(string) c.Check(manifest, Equals, `./a/b 307372fa8fd5c146b22ae7a45b49bc31+6 0:6:c.out -./foo 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396c73c0abcdefgh11234567890@569fa8c3 9:18:bar 9:18:sub1file2 +./foo 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396c73c0abcdefgh11234567890@569fa8c3 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396cabcdefghij6419876543234@569fa8c4 9:18:bar 36:18:sub1file2 ./foo/baz 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396c73c0bcdefghijk544332211@569fa8c5 9:18:sub2file2 ./foo/sub1 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396cabcdefghij6419876543234@569fa8c4 0:9:file1_in_subdir1.txt 9:18:file2_in_subdir1.txt ./foo/sub1/subdir2 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396c73c0bcdefghijk544332211@569fa8c5 0:9:file1_in_subdir2.txt 9:18:file2_in_subdir2.txt @@ -1420,7 +1670,7 @@ func (s *TestSuite) TestStdoutWithMountPointsUnderOutputDirDenormalizedManifest( "environment": {"FROBIZ": "bilbo"}, "mounts": { "/tmp": {"kind": "tmp"}, - "/tmp/foo/bar": {"kind": "collection", "portable_data_hash": "b0def87f80dd594d4675809e83bd4f15+367/subdir1/file2_in_subdir1.txt"}, + "/tmp/foo/bar": {"kind": "collection", "portable_data_hash": "b0def87f80dd594d4675809e83bd4f15+367", "path": "/subdir1/file2_in_subdir1.txt"}, "stdout": {"kind": "file", "path": "/tmp/a/b/c.out"} }, "output_path": "/tmp", @@ -1432,7 +1682,7 @@ func (s *TestSuite) TestStdoutWithMountPointsUnderOutputDirDenormalizedManifest( "b0def87f80dd594d4675809e83bd4f15+367/subdir1/file2_in_subdir1.txt", } - api, _, _ := FullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { + api, _, _ := s.fullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) t.logWriter.Close() }) @@ -1453,52 +1703,6 @@ func (s *TestSuite) TestStdoutWithMountPointsUnderOutputDirDenormalizedManifest( } } -func (s *TestSuite) TestOutputSymlinkToInput(c *C) { - helperRecord := `{ - "command": ["/bin/sh", "-c", "echo $FROBIZ"], - "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", - "cwd": "/bin", - "environment": {"FROBIZ": "bilbo"}, - "mounts": { - "/tmp": {"kind": "tmp"}, - "/keep/foo/sub1file2": {"kind": "collection", "portable_data_hash": "a0def87f80dd594d4675809e83bd4f15+367", "path": "/subdir1/file2_in_subdir1.txt"}, - "/keep/foo2": {"kind": "collection", "portable_data_hash": "a0def87f80dd594d4675809e83bd4f15+367"} - }, - "output_path": "/tmp", - "priority": 1, - "runtime_constraints": {} - }` - - extraMounts := []string{ - "a0def87f80dd594d4675809e83bd4f15+367/subdir1/file2_in_subdir1.txt", - } - - api, _, _ := FullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { - os.Symlink("/keep/foo/sub1file2", t.realTemp+"/2/baz") - os.Symlink("/keep/foo2/subdir1/file2_in_subdir1.txt", t.realTemp+"/2/baz2") - os.Symlink("/keep/foo2/subdir1", t.realTemp+"/2/baz3") - os.Mkdir(t.realTemp+"/2/baz4", 0700) - os.Symlink("/keep/foo2/subdir1/file2_in_subdir1.txt", t.realTemp+"/2/baz4/baz5") - t.logWriter.Close() - }) - - c.Check(api.CalledWith("container.exit_code", 0), NotNil) - c.Check(api.CalledWith("container.state", "Complete"), NotNil) - for _, v := range api.Content { - if v["collection"] != nil { - collection := v["collection"].(arvadosclient.Dict) - if strings.Index(collection["name"].(string), "output") == 0 { - manifest := collection["manifest_text"].(string) - c.Check(manifest, Equals, `. 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396cabcdefghij6419876543234@569fa8c4 9:18:baz 9:18:baz2 -./baz3 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396cabcdefghij6419876543234@569fa8c4 0:9:file1_in_subdir1.txt 9:18:file2_in_subdir1.txt -./baz3/subdir2 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396c73c0bcdefghijk544332211@569fa8c5 0:9:file1_in_subdir2.txt 9:18:file2_in_subdir2.txt -./baz4 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396cabcdefghij6419876543234@569fa8c4 9:18:baz5 -`) - } - } - } -} - func (s *TestSuite) TestOutputError(c *C) { helperRecord := `{ "command": ["/bin/sh", "-c", "echo $FROBIZ"], @@ -1515,8 +1719,8 @@ func (s *TestSuite) TestOutputError(c *C) { extraMounts := []string{} - api, _, _ := FullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { - os.Symlink("/etc/hosts", t.realTemp+"/2/baz") + api, _, _ := s.fullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { + os.Symlink("/etc/hosts", t.realTemp+"/tmp2/baz") t.logWriter.Close() }) @@ -1543,7 +1747,7 @@ func (s *TestSuite) TestStdinCollectionMountPoint(c *C) { "b0def87f80dd594d4675809e83bd4f15+367/file1_in_main.txt", } - api, _, _ := FullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { + api, _, _ := s.fullRunHelper(c, helperRecord, extraMounts, 0, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) t.logWriter.Close() }) @@ -1578,7 +1782,7 @@ func (s *TestSuite) TestStdinJsonMountPoint(c *C) { "runtime_constraints": {} }` - api, _, _ := FullRunHelper(c, helperRecord, nil, 0, func(t *TestDockerClient) { + api, _, _ := s.fullRunHelper(c, helperRecord, nil, 0, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) t.logWriter.Close() }) @@ -1598,7 +1802,7 @@ func (s *TestSuite) TestStdinJsonMountPoint(c *C) { } func (s *TestSuite) TestStderrMount(c *C) { - api, _, _ := FullRunHelper(c, `{ + api, _, _ := s.fullRunHelper(c, `{ "command": ["/bin/sh", "-c", "echo hello;exit 1"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -1624,7 +1828,10 @@ func (s *TestSuite) TestStderrMount(c *C) { } func (s *TestSuite) TestNumberRoundTrip(c *C) { - cr := NewContainerRunner(&ArvTestClient{callraw: true}, &KeepTestClient{}, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + kc := &KeepTestClient{} + defer kc.Close() + cr, err := NewContainerRunner(s.client, &ArvTestClient{callraw: true}, kc, nil, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") + c.Assert(err, IsNil) cr.fetchContainerRecord() jsondata, err := json.Marshal(cr.Container.Mounts["/json"].Content) @@ -1632,3 +1839,207 @@ func (s *TestSuite) TestNumberRoundTrip(c *C) { c.Check(err, IsNil) c.Check(string(jsondata), Equals, `{"number":123456789123456789}`) } + +func (s *TestSuite) TestFullBrokenDocker1(c *C) { + tf, err := ioutil.TempFile("", "brokenNodeHook-") + c.Assert(err, IsNil) + defer os.Remove(tf.Name()) + + tf.Write([]byte(`#!/bin/sh +exec echo killme +`)) + tf.Close() + os.Chmod(tf.Name(), 0700) + + ech := tf.Name() + brokenNodeHook = &ech + + api, _, _ := s.fullRunHelper(c, `{ + "command": ["echo", "hello world"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": ".", + "environment": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} +}`, nil, 2, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, "hello world\n")) + t.logWriter.Close() + }) + + c.Check(api.CalledWith("container.state", "Queued"), NotNil) + c.Check(api.Logs["crunch-run"].String(), Matches, "(?ms).*unable to run containers.*") + c.Check(api.Logs["crunch-run"].String(), Matches, "(?ms).*Running broken node hook.*") + c.Check(api.Logs["crunch-run"].String(), Matches, "(?ms).*killme.*") + +} + +func (s *TestSuite) TestFullBrokenDocker2(c *C) { + ech := "" + brokenNodeHook = &ech + + api, _, _ := s.fullRunHelper(c, `{ + "command": ["echo", "hello world"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": ".", + "environment": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} +}`, nil, 2, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, "hello world\n")) + t.logWriter.Close() + }) + + c.Check(api.CalledWith("container.state", "Queued"), NotNil) + c.Check(api.Logs["crunch-run"].String(), Matches, "(?ms).*unable to run containers.*") + c.Check(api.Logs["crunch-run"].String(), Matches, "(?ms).*No broken node hook.*") +} + +func (s *TestSuite) TestFullBrokenDocker3(c *C) { + ech := "" + brokenNodeHook = &ech + + api, _, _ := s.fullRunHelper(c, `{ + "command": ["echo", "hello world"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": ".", + "environment": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} +}`, nil, 3, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, "hello world\n")) + t.logWriter.Close() + }) + + c.Check(api.CalledWith("container.state", "Cancelled"), NotNil) + c.Check(api.Logs["crunch-run"].String(), Matches, "(?ms).*unable to run containers.*") +} + +func (s *TestSuite) TestBadCommand1(c *C) { + ech := "" + brokenNodeHook = &ech + + api, _, _ := s.fullRunHelper(c, `{ + "command": ["echo", "hello world"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": ".", + "environment": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} +}`, nil, 4, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, "hello world\n")) + t.logWriter.Close() + }) + + c.Check(api.CalledWith("container.state", "Cancelled"), NotNil) + c.Check(api.Logs["crunch-run"].String(), Matches, "(?ms).*Possible causes:.*is missing.*") +} + +func (s *TestSuite) TestBadCommand2(c *C) { + ech := "" + brokenNodeHook = &ech + + api, _, _ := s.fullRunHelper(c, `{ + "command": ["echo", "hello world"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": ".", + "environment": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} +}`, nil, 5, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, "hello world\n")) + t.logWriter.Close() + }) + + c.Check(api.CalledWith("container.state", "Cancelled"), NotNil) + c.Check(api.Logs["crunch-run"].String(), Matches, "(?ms).*Possible causes:.*is missing.*") +} + +func (s *TestSuite) TestBadCommand3(c *C) { + ech := "" + brokenNodeHook = &ech + + api, _, _ := s.fullRunHelper(c, `{ + "command": ["echo", "hello world"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": ".", + "environment": {}, + "mounts": {"/tmp": {"kind": "tmp"} }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} +}`, nil, 6, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, "hello world\n")) + t.logWriter.Close() + }) + + c.Check(api.CalledWith("container.state", "Cancelled"), NotNil) + c.Check(api.Logs["crunch-run"].String(), Matches, "(?ms).*Possible causes:.*is missing.*") +} + +func (s *TestSuite) TestSecretTextMountPoint(c *C) { + // under normal mounts, gets captured in output, oops + helperRecord := `{ + "command": ["true"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": "/bin", + "mounts": { + "/tmp": {"kind": "tmp"}, + "/tmp/secret.conf": {"kind": "text", "content": "mypassword"} + }, + "secret_mounts": { + }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} + }` + + api, _, _ := s.fullRunHelper(c, helperRecord, nil, 0, func(t *TestDockerClient) { + content, err := ioutil.ReadFile(t.realTemp + "/tmp2/secret.conf") + c.Check(err, IsNil) + c.Check(content, DeepEquals, []byte("mypassword")) + t.logWriter.Close() + }) + + c.Check(api.CalledWith("container.exit_code", 0), NotNil) + c.Check(api.CalledWith("container.state", "Complete"), NotNil) + c.Check(api.CalledWith("collection.manifest_text", ". 34819d7beeabb9260a5c854bc85b3e44+10 0:10:secret.conf\n"), NotNil) + c.Check(api.CalledWith("collection.manifest_text", ""), IsNil) + + // under secret mounts, not captured in output + helperRecord = `{ + "command": ["true"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": "/bin", + "mounts": { + "/tmp": {"kind": "tmp"} + }, + "secret_mounts": { + "/tmp/secret.conf": {"kind": "text", "content": "mypassword"} + }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} + }` + + api, _, _ = s.fullRunHelper(c, helperRecord, nil, 0, func(t *TestDockerClient) { + content, err := ioutil.ReadFile(t.realTemp + "/tmp2/secret.conf") + c.Check(err, IsNil) + c.Check(content, DeepEquals, []byte("mypassword")) + t.logWriter.Close() + }) + + c.Check(api.CalledWith("container.exit_code", 0), NotNil) + c.Check(api.CalledWith("container.state", "Complete"), NotNil) + c.Check(api.CalledWith("collection.manifest_text", ". 34819d7beeabb9260a5c854bc85b3e44+10 0:10:secret.conf\n"), IsNil) + c.Check(api.CalledWith("collection.manifest_text", ""), NotNil) +}