X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fb181ba27fd354e596d2216786ccee9a537bd0a3..844ff7cc1dc1c93a29b7ad8eca2987b987cf89e6:/lib/crunchrun/crunchrun.go

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index 6ac7a5f0cc..0253ac3fa8 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -422,7 +422,7 @@ func (runner *ContainerRunner) SetupMounts() (map[string]bindmount, error) {
 		"--storage-classes", strings.Join(runner.Container.OutputStorageClasses, ","),
 		fmt.Sprintf("--crunchstat-interval=%v", runner.statInterval.Seconds())}
 
-	if runner.executor.Runtime() == "docker" {
+	if _, isdocker := runner.executor.(*dockerExecutor); isdocker {
 		arvMountCmd = append(arvMountCmd, "--allow-other")
 	}
 
@@ -1479,7 +1479,10 @@ func (runner *ContainerRunner) NewArvLogWriter(name string) (io.WriteCloser, err
 func (runner *ContainerRunner) Run() (err error) {
 	runner.CrunchLog.Printf("crunch-run %s started", cmd.Version.String())
 	runner.CrunchLog.Printf("%s", currentUserAndGroups())
-	runner.CrunchLog.Printf("Executing container '%s' using %s runtime", runner.Container.UUID, runner.executor.Runtime())
+	v, _ := exec.Command("arv-mount", "--version").CombinedOutput()
+	runner.CrunchLog.Printf("Using FUSE mount: %s", v)
+	runner.CrunchLog.Printf("Using container runtime: %s", runner.executor.Runtime())
+	runner.CrunchLog.Printf("Executing container: %s", runner.Container.UUID)
 
 	hostname, hosterr := os.Hostname()
 	if hosterr != nil {
@@ -2001,14 +2004,15 @@ func loadClusterConfigFile(path string, stderr io.Writer) *arvados.Cluster {
 	ldr.Path = path
 	cfg, err := ldr.Load()
 	if err != nil {
-		fmt.Fprintf(stderr, "could not load config file %s: %s", path, err)
+		fmt.Fprintf(stderr, "could not load config file %s: %s\n", path, err)
 		return nil
 	}
 	cluster, err := cfg.GetCluster("")
 	if err != nil {
-		fmt.Fprintf(stderr, "could not use config file %s: %s", path, err)
+		fmt.Fprintf(stderr, "could not use config file %s: %s\n", path, err)
 		return nil
 	}
+	fmt.Fprintf(stderr, "loaded config file %s\n", path)
 	return cluster
 }