X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6b2005a2fa3e7c040f8db222010fa870f87336bf..a54e88868ac259443e2cd8d5f6fddb4b8154acb9:/services/crunch-run/crunchrun.go?ds=sidebyside

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 63b63a16a2..e0d707a5a5 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -533,17 +533,29 @@ func (runner *ContainerRunner) LogNodeInfo() (err error) {
 		},
 		infoCommand{
 			label: "Disk Space",
-			cmd:   []string{"df", "-m"},
+			cmd:   []string{"df", "-m", "/"},
+		},
+		infoCommand{
+			label: "Disk Space",
+			cmd:   []string{"df", "-m", os.TempDir()},
+		},
+		infoCommand{
+			label: "Disk INodes",
+			cmd:   []string{"df", "-i", "/"},
+		},
+		infoCommand{
+			label: "Disk INodes",
+			cmd:   []string{"df", "-i", os.TempDir()},
 		},
 	}
 
 	// Run commands with informational output to be logged.
 	var out []byte
 	for _, command := range commands {
-		out, err = exec.Command(command.cmd[0], command.cmd[1:]...).Output()
+		out, err = exec.Command(command.cmd[0], command.cmd[1:]...).CombinedOutput()
 		if err != nil {
-			return fmt.Errorf("While running command '%s': %v",
-				command.cmd[0], err)
+			return fmt.Errorf("While running command %q: %v",
+				command.cmd, err)
 		}
 		logger.Println(command.label)
 		for _, line := range strings.Split(string(out), "\n") {