10218: Avoid running df commands more than necessary. Updated test to check for disk...

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index e0d707a5a538b7800c8ef70abaf7b618d3c3f321..26c8a7a7eab29e420c69181d3fd19e825fe5a72f 100644 (file)
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -533,19 +533,11 @@ func (runner *ContainerRunner) LogNodeInfo() (err error) {
                },
                infoCommand{
                        label: "Disk Space",
-                       cmd:   []string{"df", "-m", "/"},
-               },
-               infoCommand{
-                       label: "Disk Space",
-                       cmd:   []string{"df", "-m", os.TempDir()},
-               },
-               infoCommand{
-                       label: "Disk INodes",
-                       cmd:   []string{"df", "-i", "/"},
+                       cmd:   []string{"df", "-m", "/", os.TempDir()},
                },
                infoCommand{
                        label: "Disk INodes",
-                       cmd:   []string{"df", "-i", os.TempDir()},
+                       cmd:   []string{"df", "-i", "/", os.TempDir()},
                },
        }
 
@@ -583,6 +575,7 @@ func (runner *ContainerRunner) LogContainerRecord() (err error) {
        if err != nil {
                return fmt.Errorf("While retrieving container record from the API server: %v", err)
        }
+       defer reader.Close()
        // Read the API server response as []byte
        json_bytes, err := ioutil.ReadAll(reader)
        if err != nil {

diff --git a/services/crunch-run/crunchrun_test.go b/services/crunch-run/crunchrun_test.go
index 9b12dd96fd2680b3d91c83a7fd7e5adadab2a1e1..7224c4f1b3d622051e1506da7bc1116f443ac003 100644 (file)
--- a/services/crunch-run/crunchrun_test.go
+++ b/services/crunch-run/crunchrun_test.go
@@ -695,6 +695,7 @@ func (s *TestSuite) TestNodeInfoLog(c *C) {
        c.Check(api.Logs["node-info"].String(), Matches, `(?ms).*CPU Information.*`)
        c.Check(api.Logs["node-info"].String(), Matches, `(?ms).*Memory Information.*`)
        c.Check(api.Logs["node-info"].String(), Matches, `(?ms).*Disk Space.*`)
+       c.Check(api.Logs["node-info"].String(), Matches, `(?ms).*Disk INodes.*`)
 }
 
 func (s *TestSuite) TestContainerRecordLog(c *C) {