X-Git-Url: https://git.arvados.org/lightning.git/blobdiff_plain/896220cbd21811433f6db068f559677927e56757..0df66c8fae2cdaf70c811379a4c1522211838a9b:/arvados.go

diff --git a/arvados.go b/arvados.go
index 6d76aded26..ec2701bcdc 100644
--- a/arvados.go
+++ b/arvados.go
@@ -267,6 +267,9 @@ func (runner *arvadosContainerRunner) RunContext(ctx context.Context) (string, e
 				Preemptible: true,
 				Partitions:  []string{},
 			},
+			"environment": map[string]string{
+				"GOMAXPROCS": fmt.Sprintf("%d", rc.VCPUs),
+			},
 		},
 	})
 	if err != nil {
@@ -511,7 +514,12 @@ var (
 	siteFSMtx            sync.Mutex
 )
 
-func open(fnm string) (io.ReadCloser, error) {
+type file interface {
+	io.ReadCloser
+	Readdir(n int) ([]os.FileInfo, error)
+}
+
+func open(fnm string) (file, error) {
 	if os.Getenv("ARVADOS_API_HOST") == "" {
 		return os.Open(fnm)
 	}
@@ -520,8 +528,8 @@ func open(fnm string) (io.ReadCloser, error) {
 		return os.Open(fnm)
 	}
 	uuid := m[2]
-	mnt := "/mnt/" + uuid + "/"
-	if !strings.HasPrefix(fnm, mnt) {
+	mnt := "/mnt/" + uuid
+	if fnm != mnt && !strings.HasPrefix(fnm, mnt+"/") {
 		return os.Open(fnm)
 	}
 
@@ -544,5 +552,5 @@ func open(fnm string) (io.ReadCloser, error) {
 	}
 
 	log.Infof("reading %q from %s using Arvados client", fnm[len(mnt):], uuid)
-	return siteFS.Open("by_id/" + uuid + "/" + fnm[len(mnt):])
+	return siteFS.Open("by_id/" + uuid + fnm[len(mnt):])
 }