X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7466d0c1af1f7d9a0c1b4ae54e9f1bbc951f2711..cf0c4c381a2b34130f072096038a430e3c6bbe55:/services/crunch-run/copier.go

diff --git a/services/crunch-run/copier.go b/services/crunch-run/copier.go
index 3ba6eed3f7..3f529f6313 100644
--- a/services/crunch-run/copier.go
+++ b/services/crunch-run/copier.go
@@ -54,6 +54,7 @@ type copier struct {
 	keepClient    IKeepClient
 	hostOutputDir string
 	ctrOutputDir  string
+	binds         []string
 	mounts        map[string]arvados.Mount
 	secretMounts  map[string]arvados.Mount
 	logger        printfer
@@ -69,22 +70,22 @@ type copier struct {
 func (cp *copier) Copy() (string, error) {
 	err := cp.walkMount("", cp.ctrOutputDir, limitFollowSymlinks, true)
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("error scanning files to copy to output: %v", err)
 	}
 	fs, err := (&arvados.Collection{ManifestText: cp.manifest}).FileSystem(cp.client, cp.keepClient)
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("error creating Collection.FileSystem: %v", err)
 	}
 	for _, d := range cp.dirs {
 		err = fs.Mkdir(d, 0777)
-		if err != nil {
-			return "", err
+		if err != nil && err != os.ErrExist {
+			return "", fmt.Errorf("error making directory %q in output collection: %v", d, err)
 		}
 	}
 	for _, f := range cp.files {
 		err = cp.copyFile(fs, f)
 		if err != nil {
-			return "", err
+			return "", fmt.Errorf("error copying file %q into output collection: %v", f, err)
 		}
 	}
 	return fs.MarshalManifest(".")
@@ -157,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
 		}
@@ -170,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)
@@ -316,6 +319,21 @@ 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)
 }