X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ffd4738242c61fa5acd423f927339f836dfb0ffb..2db0c3a44d8f12e3a566c796bdecaa1de150b155:/services/crunch-run/crunchrun_test.go diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go index b9856aca29..eaf62d192e 100644 --- a/services/crunch-run/crunchrun_test.go +++ b/services/crunch-run/crunchrun_test.go @@ -6,12 +6,6 @@ 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" - "github.com/curoverse/dockerclient" - . "gopkg.in/check.v1" "io" "io/ioutil" "os" @@ -23,6 +17,13 @@ import ( "syscall" "testing" "time" + + "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" + "github.com/curoverse/dockerclient" + . "gopkg.in/check.v1" ) // Gocheck boilerplate @@ -40,9 +41,9 @@ type ArvTestClient struct { Calls int Content []arvadosclient.Dict arvados.Container - Logs map[string]*bytes.Buffer - WasSetRunning bool + Logs map[string]*bytes.Buffer sync.Mutex + WasSetRunning bool } type KeepTestClient struct { @@ -57,6 +58,12 @@ var hwImageId = "9c31ee32b3d15268a0754e8edc74d4f815ee014b693bc5109058e431dd5caea var otherManifest = ". 68a84f561b1d1708c6baff5e019a9ab3+46+Ae5d0af96944a3690becb1decdf60cc1c937f556d@5693216f 0:46:md5sum.txt\n" var otherPDH = "a3e8f74c6f101eae01fa08bfb4e49b3a+54" +var normalizedManifestWithSubdirs = ". 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396c73c0abcdefgh11234567890@569fa8c3 0:9:file1_in_main.txt 9:18:file2_in_main.txt 0:27:zzzzz-8i9sb-bcdefghijkdhvnk.log.txt\n./subdir1 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396cabcdefghij6419876543234@569fa8c4 0:9:file1_in_subdir1.txt 9:18:file2_in_subdir1.txt\n./subdir1/subdir2 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396c73c0bcdefghijk544332211@569fa8c5 0:9:file1_in_subdir2.txt 9:18:file2_in_subdir2.txt\n" +var normalizedWithSubdirsPDH = "a0def87f80dd594d4675809e83bd4f15+367" + +var denormalizedManifestWithSubdirs = ". 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396c73c0abcdefgh11234567890@569fa8c3 0:9:file1_in_main.txt 9:18:file2_in_main.txt 0:27:zzzzz-8i9sb-bcdefghijkdhvnk.log.txt 0:10:subdir1/file1_in_subdir1.txt 10:17:subdir1/file2_in_subdir1.txt\n" +var denormalizedWithSubdirsPDH = "b0def87f80dd594d4675809e83bd4f15+367" + var fakeAuthUUID = "zzzzz-gj3su-55pqoyepgi2glem" var fakeAuthToken = "a3ltuwzqcu2u4sc0q7yhpc2w7s00fdcqecg5d6e0u3pfohmbjt" @@ -182,6 +189,10 @@ func (client *ArvTestClient) Get(resourceType string, uuid string, parameters ar output.(*arvados.Collection).ManifestText = hwManifest } else if uuid == otherPDH { output.(*arvados.Collection).ManifestText = otherManifest + } else if uuid == normalizedWithSubdirsPDH { + output.(*arvados.Collection).ManifestText = normalizedManifestWithSubdirs + } else if uuid == denormalizedWithSubdirsPDH { + output.(*arvados.Collection).ManifestText = denormalizedManifestWithSubdirs } } if resourceType == "containers" { @@ -245,7 +256,11 @@ func (fw FileWrapper) Len() uint64 { return fw.len } -func (client *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { +func (fw FileWrapper) Seek(int64, int) (int64, error) { + return 0, errors.New("not implemented") +} + +func (client *KeepTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.Reader, error) { if filename == hwImageId+".tar" { rdr := ioutil.NopCloser(&bytes.Buffer{}) client.Called = true @@ -324,7 +339,7 @@ func (KeepErrorTestClient) PutHB(hash string, buf []byte) (string, int, error) { return "", 0, errors.New("KeepError") } -func (KeepErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { +func (KeepErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.Reader, error) { return nil, errors.New("KeepError") } @@ -348,7 +363,11 @@ func (ErrorReader) Len() uint64 { return 0 } -func (KeepReadErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.ReadCloserWithLen, error) { +func (ErrorReader) Seek(int64, int) (int64, error) { + return 0, errors.New("ErrorReader") +} + +func (KeepReadErrorTestClient) ManifestFileReader(m manifest.Manifest, filename string) (keepclient.Reader, error) { return ErrorReader{}, nil } @@ -518,7 +537,7 @@ 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, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner) { +func FullRunHelper(c *C, record string, extraMounts []string, fn func(t *TestDockerClient)) (api *ArvTestClient, cr *ContainerRunner, realTemp string) { rec := arvados.Container{} err := json.Unmarshal([]byte(record), &rec) c.Check(err, IsNil) @@ -534,6 +553,31 @@ func FullRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvT am := &ArvMountCmdLine{} cr.RunArvMount = am.ArvMountTest + realTemp, err = ioutil.TempDir("", "crunchrun_test1-") + c.Assert(err, IsNil) + defer os.RemoveAll(realTemp) + + tempcount := 0 + cr.MkTempDir = func(_ string, prefix string) (string, error) { + tempcount++ + d := fmt.Sprintf("%s/%s%d", realTemp, prefix, tempcount) + 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 + } + + if extraMounts != nil && len(extraMounts) > 0 { + err := cr.SetupArvMountPoint("keep") + c.Check(err, IsNil) + + for _, m := range extraMounts { + os.MkdirAll(cr.ArvMountPoint+"/by_id/"+m, os.ModePerm) + } + } + err = cr.Run() c.Check(err, IsNil) c.Check(api.WasSetRunning, Equals, true) @@ -551,7 +595,7 @@ func FullRunHelper(c *C, record string, fn func(t *TestDockerClient)) (api *ArvT } func (s *TestSuite) TestFullRunHello(c *C) { - api, _ := FullRunHelper(c, `{ + api, _, _ := FullRunHelper(c, `{ "command": ["echo", "hello world"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -560,7 +604,7 @@ func (s *TestSuite) TestFullRunHello(c *C) { "output_path": "/tmp", "priority": 1, "runtime_constraints": {} -}`, func(t *TestDockerClient) { +}`, nil, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, "hello world\n")) t.logWriter.Close() t.finish <- dockerclient.WaitResult{} @@ -573,7 +617,7 @@ func (s *TestSuite) TestFullRunHello(c *C) { } func (s *TestSuite) TestCrunchstat(c *C) { - api, _ := FullRunHelper(c, `{ + api, _, _ := FullRunHelper(c, `{ "command": ["sleep", "1"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -582,7 +626,7 @@ func (s *TestSuite) TestCrunchstat(c *C) { "output_path": "/tmp", "priority": 1, "runtime_constraints": {} - }`, func(t *TestDockerClient) { + }`, nil, func(t *TestDockerClient) { time.Sleep(time.Second) t.logWriter.Close() t.finish <- dockerclient.WaitResult{} @@ -606,7 +650,7 @@ func (s *TestSuite) TestCrunchstat(c *C) { } func (s *TestSuite) TestFullRunStderr(c *C) { - api, _ := FullRunHelper(c, `{ + api, _, _ := FullRunHelper(c, `{ "command": ["/bin/sh", "-c", "echo hello ; echo world 1>&2 ; exit 1"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -615,7 +659,7 @@ func (s *TestSuite) TestFullRunStderr(c *C) { "output_path": "/tmp", "priority": 1, "runtime_constraints": {} -}`, func(t *TestDockerClient) { +}`, nil, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, "hello\n")) t.logWriter.Write(dockerLog(2, "world\n")) t.logWriter.Close() @@ -632,7 +676,7 @@ func (s *TestSuite) TestFullRunStderr(c *C) { } func (s *TestSuite) TestFullRunDefaultCwd(c *C) { - api, _ := FullRunHelper(c, `{ + api, _, _ := FullRunHelper(c, `{ "command": ["pwd"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": ".", @@ -641,7 +685,7 @@ func (s *TestSuite) TestFullRunDefaultCwd(c *C) { "output_path": "/tmp", "priority": 1, "runtime_constraints": {} -}`, func(t *TestDockerClient) { +}`, nil, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.cwd+"\n")) t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 0} @@ -654,7 +698,7 @@ func (s *TestSuite) TestFullRunDefaultCwd(c *C) { } func (s *TestSuite) TestFullRunSetCwd(c *C) { - api, _ := FullRunHelper(c, `{ + api, _, _ := FullRunHelper(c, `{ "command": ["pwd"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": "/bin", @@ -663,7 +707,7 @@ func (s *TestSuite) TestFullRunSetCwd(c *C) { "output_path": "/tmp", "priority": 1, "runtime_constraints": {} -}`, func(t *TestDockerClient) { +}`, nil, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.cwd+"\n")) t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 0} @@ -674,7 +718,28 @@ func (s *TestSuite) TestFullRunSetCwd(c *C) { c.Check(strings.HasSuffix(api.Logs["stdout"].String(), "/bin\n"), Equals, true) } -func (s *TestSuite) TestCancel(c *C) { +func (s *TestSuite) TestStopOnSignal(c *C) { + s.testStopContainer(c, func(cr *ContainerRunner) { + go func() { + for cr.ContainerID == "" { + time.Sleep(time.Millisecond) + } + cr.SigChan <- syscall.SIGINT + }() + }) +} + +func (s *TestSuite) TestStopOnArvMountDeath(c *C) { + s.testStopContainer(c, func(cr *ContainerRunner) { + cr.ArvMountExit = make(chan error) + go func() { + cr.ArvMountExit <- exec.Command("true").Run() + close(cr.ArvMountExit) + }() + }) +} + +func (s *TestSuite) testStopContainer(c *C, setup func(cr *ContainerRunner)) { record := `{ "command": ["/bin/sh", "-c", "echo foo && sleep 30 && echo bar"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", @@ -701,34 +766,31 @@ func (s *TestSuite) TestCancel(c *C) { api := &ArvTestClient{Container: rec} cr := NewContainerRunner(api, &KeepTestClient{}, docker, "zzzzz-zzzzz-zzzzzzzzzzzzzzz") - am := &ArvMountCmdLine{} - cr.RunArvMount = am.ArvMountTest + cr.RunArvMount = func([]string, string) (*exec.Cmd, error) { return nil, nil } + setup(cr) + done := make(chan error) go func() { - for cr.ContainerID == "" { - time.Sleep(time.Millisecond) - } - cr.SigChan <- syscall.SIGINT + done <- cr.Run() }() - - err = cr.Run() - - c.Check(err, IsNil) - if err != nil { - for k, v := range api.Logs { - c.Log(k) - c.Log(v.String()) - } + select { + case <-time.After(20 * time.Second): + c.Fatal("timed out") + case err = <-done: + c.Check(err, IsNil) + } + for k, v := range api.Logs { + c.Log(k) + c.Log(v.String()) } 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) - } func (s *TestSuite) TestFullRunSetEnv(c *C) { - api, _ := FullRunHelper(c, `{ + api, _, _ := FullRunHelper(c, `{ "command": ["/bin/sh", "-c", "echo $FROBIZ"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": "/bin", @@ -737,7 +799,7 @@ func (s *TestSuite) TestFullRunSetEnv(c *C) { "output_path": "/tmp", "priority": 1, "runtime_constraints": {} -}`, func(t *TestDockerClient) { +}`, nil, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 0} @@ -805,6 +867,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { { i = 0 + cr.ArvMountPoint = "" cr.Container.Mounts = make(map[string]arvados.Mount) cr.Container.Mounts["/tmp"] = arvados.Mount{Kind: "tmp"} cr.OutputPath = "/tmp" @@ -819,6 +882,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { { i = 0 + cr.ArvMountPoint = "" cr.Container.Mounts = make(map[string]arvados.Mount) cr.Container.Mounts["/tmp"] = arvados.Mount{Kind: "tmp"} cr.OutputPath = "/tmp" @@ -838,6 +902,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { { i = 0 + cr.ArvMountPoint = "" cr.Container.Mounts = map[string]arvados.Mount{ "/keeptmp": {Kind: "collection", Writable: true}, } @@ -855,6 +920,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { { i = 0 + cr.ArvMountPoint = "" cr.Container.Mounts = map[string]arvados.Mount{ "/keepinp": {Kind: "collection", PortableDataHash: "59389a8f9ee9d399be35462a0f92541c+53"}, "/keepout": {Kind: "collection", Writable: true}, @@ -876,6 +942,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { { i = 0 + cr.ArvMountPoint = "" cr.Container.RuntimeConstraints.KeepCacheRAM = 512 cr.Container.Mounts = map[string]arvados.Mount{ "/keepinp": {Kind: "collection", PortableDataHash: "59389a8f9ee9d399be35462a0f92541c+53"}, @@ -905,6 +972,7 @@ func (s *TestSuite) TestSetupMounts(c *C) { {in: map[string]int{"foo": 123}, out: `{"foo":123}`}, } { i = 0 + cr.ArvMountPoint = "" cr.Container.Mounts = map[string]arvados.Mount{ "/mnt/test.json": {Kind: "json", Content: test.in}, } @@ -918,6 +986,63 @@ func (s *TestSuite) TestSetupMounts(c *C) { cr.CleanupDirs() checkEmpty() } + + // Read-only mount points are allowed underneath 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"}, + } + cr.OutputPath = "/tmp" + + 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", "--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"}) + cr.CleanupDirs() + checkEmpty() + } + + // Writable mount points are not allowed underneath 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}, + } + cr.OutputPath = "/tmp" + + err := cr.SetupMounts() + c.Check(err, NotNil) + c.Check(err, ErrorMatches, `Writable mount points are not permitted underneath the output_path.*`) + cr.CleanupDirs() + checkEmpty() + } + + // Only mount points of kind 'collection' are allowed underneath 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: "json"}, + } + 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.*`) + cr.CleanupDirs() + checkEmpty() + } } func (s *TestSuite) TestStdout(c *C) { @@ -932,7 +1057,7 @@ func (s *TestSuite) TestStdout(c *C) { "runtime_constraints": {} }` - api, _ := FullRunHelper(c, helperRecord, func(t *TestDockerClient) { + api, _, _ := FullRunHelper(c, helperRecord, nil, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 0} @@ -995,7 +1120,7 @@ func (s *TestSuite) TestStdoutWithWrongKindCollection(c *C) { func (s *TestSuite) TestFullRunWithAPI(c *C) { os.Setenv("ARVADOS_API_HOST", "test.arvados.org") defer os.Unsetenv("ARVADOS_API_HOST") - api, _ := FullRunHelper(c, `{ + api, _, _ := FullRunHelper(c, `{ "command": ["/bin/sh", "-c", "echo $ARVADOS_API_HOST"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": "/bin", @@ -1004,7 +1129,7 @@ func (s *TestSuite) TestFullRunWithAPI(c *C) { "output_path": "/tmp", "priority": 1, "runtime_constraints": {"API": true} -}`, func(t *TestDockerClient) { +}`, nil, func(t *TestDockerClient) { t.logWriter.Write(dockerLog(1, t.env[1][17:]+"\n")) t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 0} @@ -1019,7 +1144,7 @@ func (s *TestSuite) TestFullRunWithAPI(c *C) { func (s *TestSuite) TestFullRunSetOutput(c *C) { os.Setenv("ARVADOS_API_HOST", "test.arvados.org") defer os.Unsetenv("ARVADOS_API_HOST") - api, _ := FullRunHelper(c, `{ + api, _, _ := FullRunHelper(c, `{ "command": ["/bin/sh", "-c", "echo $ARVADOS_API_HOST"], "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", "cwd": "/bin", @@ -1028,7 +1153,7 @@ func (s *TestSuite) TestFullRunSetOutput(c *C) { "output_path": "/tmp", "priority": 1, "runtime_constraints": {"API": true} -}`, func(t *TestDockerClient) { +}`, nil, func(t *TestDockerClient) { t.api.Container.Output = "d4ab34d3d4f8a72f5c4973051ae69fab+122" t.logWriter.Close() t.finish <- dockerclient.WaitResult{ExitCode: 0} @@ -1038,3 +1163,134 @@ func (s *TestSuite) TestFullRunSetOutput(c *C) { c.Check(api.CalledWith("container.state", "Complete"), NotNil) c.Check(api.CalledWith("container.output", "d4ab34d3d4f8a72f5c4973051ae69fab+122"), NotNil) } + +func (s *TestSuite) TestStdoutWithExcludeFromOutputMountPointUnderOutputDir(c *C) { + helperRecord := `{ + "command": ["/bin/sh", "-c", "echo $FROBIZ"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": "/bin", + "environment": {"FROBIZ": "bilbo"}, + "mounts": { + "/tmp": {"kind": "tmp"}, + "/tmp/foo": {"kind": "collection", + "portable_data_hash": "a3e8f74c6f101eae01fa08bfb4e49b3a+54", + "exclude_from_output": true + }, + "stdout": {"kind": "file", "path": "/tmp/a/b/c.out"} + }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} + }` + + extraMounts := []string{"a3e8f74c6f101eae01fa08bfb4e49b3a+54"} + + api, _, _ := FullRunHelper(c, helperRecord, extraMounts, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\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(api.CalledWith("collection.manifest_text", "./a/b 307372fa8fd5c146b22ae7a45b49bc31+6 0:6:c.out\n"), NotNil) +} + +func (s *TestSuite) TestStdoutWithMultipleMountPointsUnderOutputDir(c *C) { + helperRecord := `{ + "command": ["/bin/sh", "-c", "echo $FROBIZ"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": "/bin", + "environment": {"FROBIZ": "bilbo"}, + "mounts": { + "/tmp": {"kind": "tmp"}, + "/tmp/foo/bar": {"kind": "collection", "portable_data_hash": "a0def87f80dd594d4675809e83bd4f15+367", "path":"/file2_in_main.txt"}, + "/tmp/foo/sub1": {"kind": "collection", "portable_data_hash": "a0def87f80dd594d4675809e83bd4f15+367", "path":"/subdir1"}, + "/tmp/foo/sub1file2": {"kind": "collection", "portable_data_hash": "a0def87f80dd594d4675809e83bd4f15+367", "path":"/subdir1/file2_in_subdir1.txt"}, + "/tmp/foo/baz/sub2file2": {"kind": "collection", "portable_data_hash": "a0def87f80dd594d4675809e83bd4f15+367", "path":"/subdir1/subdir2/file2_in_subdir2.txt"}, + "stdout": {"kind": "file", "path": "/tmp/a/b/c.out"} + }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} + }` + + extraMounts := []string{ + "a0def87f80dd594d4675809e83bd4f15+367/file2_in_main.txt", + "a0def87f80dd594d4675809e83bd4f15+367/subdir1/file2_in_subdir1.txt", + "a0def87f80dd594d4675809e83bd4f15+367/subdir1/subdir2/file2_in_subdir2.txt", + } + + api, runner, realtemp := FullRunHelper(c, helperRecord, extraMounts, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\n")) + t.logWriter.Close() + t.finish <- dockerclient.WaitResult{ExitCode: 0} + }) + + c.Check(runner.Binds, DeepEquals, []string{realtemp + "/2:/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", + realtemp + "/keep1/by_id/a0def87f80dd594d4675809e83bd4f15+367/subdir1/file2_in_subdir1.txt:/tmp/foo/sub1file2:ro", + }) + + 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, `./a/b 307372fa8fd5c146b22ae7a45b49bc31+6 0:6:c.out +./foo 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396c73c0abcdefgh11234567890@569fa8c3 9:18:bar 9: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 +`) + } + } + } +} + +func (s *TestSuite) TestStdoutWithMountPointsUnderOutputDirDenormalizedManifest(c *C) { + helperRecord := `{ + "command": ["/bin/sh", "-c", "echo $FROBIZ"], + "container_image": "d4ab34d3d4f8a72f5c4973051ae69fab+122", + "cwd": "/bin", + "environment": {"FROBIZ": "bilbo"}, + "mounts": { + "/tmp": {"kind": "tmp"}, + "/tmp/foo/bar": {"kind": "collection", "portable_data_hash": "b0def87f80dd594d4675809e83bd4f15+367/subdir1/file2_in_subdir1.txt"}, + "stdout": {"kind": "file", "path": "/tmp/a/b/c.out"} + }, + "output_path": "/tmp", + "priority": 1, + "runtime_constraints": {} + }` + + extraMounts := []string{ + "b0def87f80dd594d4675809e83bd4f15+367/subdir1/file2_in_subdir1.txt", + } + + api, _, _ := FullRunHelper(c, helperRecord, extraMounts, func(t *TestDockerClient) { + t.logWriter.Write(dockerLog(1, t.env[0][7:]+"\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) + 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, `./a/b 307372fa8fd5c146b22ae7a45b49bc31+6 0:6:c.out +./foo 3e426d509afffb85e06c4c96a7c15e91+27+Aa124ac75e5168396c73c0abcdefgh11234567890@569fa8c3 10:17:bar +`) + } + } + } +}