Merge branch '13100-crunch-run-output'

[arvados.git] / services / crunch-run / copier.go

diff --git a/services/crunch-run/copier.go b/services/crunch-run/copier.go
index 273ec7917b183d4957d3b1467f57c250f734d91d..4c45f6acb9bed4162dc9eaad28f7f6af82715b81 100644 (file)
--- a/services/crunch-run/copier.go
+++ b/services/crunch-run/copier.go
@@ -45,17 +45,16 @@ type filetodo struct {
 // Symlinks to other parts of the container's filesystem result in
 // errors.
 //
-// To use a copier: first call walkMount() to inspect the output
-// directory, grab the necessary parts of already-stored collections,
-// and prepare a list of files that need to be copied from the local
-// filesystem; then call commit() to copy the file data and return a
-// complete output manifest.
+// Use:
+//
+//     manifest, err := (&copier{...}).Copy()
 type copier struct {
        client        *arvados.Client
        arvClient     IArvadosClient
        keepClient    IKeepClient
        hostOutputDir string
        ctrOutputDir  string
+       binds         []string
        mounts        map[string]arvados.Mount
        secretMounts  map[string]arvados.Mount
        logger        printfer
@@ -159,8 +158,12 @@ func (cp *copier) walkMount(dest, src string, maxSymlinks int, walkMountsBelow b
                        return err
                }
                cp.manifest += mft.Extract(srcRelPath, dest).Text
-       case srcRoot == cp.ctrOutputDir:
-               f, err := os.Open(filepath.Join(cp.hostOutputDir, ".arvados#collection"))
+       default:
+               hostRoot, err := cp.hostRoot(srcRoot)
+               if err != nil {
+                       return err
+               }
+               f, err := os.Open(filepath.Join(hostRoot, ".arvados#collection"))
                if err != nil {
                        return err
                }
@@ -172,8 +175,6 @@ func (cp *copier) walkMount(dest, src string, maxSymlinks int, walkMountsBelow b
                }
                mft := manifest.Manifest{Text: coll.ManifestText}
                cp.manifest += mft.Extract(srcRelPath, dest).Text
-       default:
-               return fmt.Errorf("cannot output %q as %q: writable collection mounted at %q", src, dest, srcRoot)
        }
        if walkMountsBelow {
                return cp.walkMountsBelow(dest, src)
@@ -187,7 +188,7 @@ func (cp *copier) walkMountsBelow(dest, src string) error {
                if !strings.HasPrefix(mnt, src+"/") {
                        continue
                }
-               if mntinfo.Kind == "text" || mntinfo.Kind == "json" {
+               if cp.copyRegularFiles(mntinfo) {
                        // These got copied into the nearest parent
                        // mount as regular files during setup, so
                        // they get copied as regular files when we
@@ -286,15 +287,15 @@ func (cp *copier) walkHostFS(dest, src string, maxSymlinks int, includeMounts bo
                        if _, isSecret := cp.secretMounts[src]; isSecret {
                                continue
                        }
-                       if mntinfo, isMount := cp.mounts[src]; isMount && mntinfo.Kind != "text" && mntinfo.Kind != "json" {
+                       if mntinfo, isMount := cp.mounts[src]; isMount && !cp.copyRegularFiles(mntinfo) {
                                // If a regular file/dir somehow
                                // exists at a path that's also a
                                // mount target, ignore the file --
                                // the mount has already been included
                                // with walkMountsBelow().
                                //
-                               // (...except json/text mounts, which
-                               // are handled as regular files.)
+                               // (...except mount types that are
+                               // handled as regular files.)
                                continue
                        }
                        err = cp.walkHostFS(dest, src, maxSymlinks, false)
@@ -318,6 +319,25 @@ func (cp *copier) walkHostFS(dest, src string, maxSymlinks int, includeMounts bo
        return fmt.Errorf("Unsupported file type (mode %o) in output dir: %q", fi.Mode(), src)
 }
 
+// Return the host path that was mounted at the given path in the
+// container.
+func (cp *copier) hostRoot(ctrRoot string) (string, error) {
+       if ctrRoot == cp.ctrOutputDir {
+               return cp.hostOutputDir, nil
+       }
+       for _, bind := range cp.binds {
+               tokens := strings.Split(bind, ":")
+               if len(tokens) >= 2 && tokens[1] == ctrRoot {
+                       return tokens[0], nil
+               }
+       }
+       return "", fmt.Errorf("not bind-mounted: %q", ctrRoot)
+}
+
+func (cp *copier) copyRegularFiles(m arvados.Mount) bool {
+       return m.Kind == "text" || m.Kind == "json" || (m.Kind == "collection" && m.Writable)
+}
+
 func (cp *copier) getManifest(pdh string) (*manifest.Manifest, error) {
        if mft, ok := cp.manifestCache[pdh]; ok {
                return mft, nil