X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44c95f99098fa6c6acbfa82d4b6cbc6015eb6e39..6a544620c4d5acb0c42cd56346f74454637904cb:/services/crunch-run/crunchrun.go

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 810955c0da..27bfa88730 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -345,7 +345,7 @@ func (runner *ContainerRunner) SetupMounts() (err error) {
 	needCertMount := true
 
 	var binds []string
-	for bind, _ := range runner.Container.Mounts {
+	for bind := range runner.Container.Mounts {
 		binds = append(binds, bind)
 	}
 	sort.Strings(binds)
@@ -592,23 +592,23 @@ func (runner *ContainerRunner) LogNodeInfo() (err error) {
 	logger := log.New(w, "node-info", 0)
 
 	commands := []infoCommand{
-		infoCommand{
+		{
 			label: "Host Information",
 			cmd:   []string{"uname", "-a"},
 		},
-		infoCommand{
+		{
 			label: "CPU Information",
 			cmd:   []string{"cat", "/proc/cpuinfo"},
 		},
-		infoCommand{
+		{
 			label: "Memory Information",
 			cmd:   []string{"cat", "/proc/meminfo"},
 		},
-		infoCommand{
+		{
 			label: "Disk Space",
 			cmd:   []string{"df", "-m", "/", os.TempDir()},
 		},
-		infoCommand{
+		{
 			label: "Disk INodes",
 			cmd:   []string{"df", "-i", "/", os.TempDir()},
 		},
@@ -650,14 +650,11 @@ func (runner *ContainerRunner) LogContainerRecord() (err error) {
 		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 {
-		return fmt.Errorf("While reading container record API server response: %v", err)
-	}
-	// Decode the JSON []byte
+
+	dec := json.NewDecoder(reader)
+	dec.UseNumber()
 	var cr map[string]interface{}
-	if err = json.Unmarshal(json_bytes, &cr); err != nil {
+	if err = dec.Decode(&cr); err != nil {
 		return fmt.Errorf("While decoding the container record JSON response: %v", err)
 	}
 	// Re-encode it using indentation to improve readability
@@ -1304,9 +1301,8 @@ func (runner *ContainerRunner) Run() (err error) {
 		runner.CrunchLog.Close()
 	}()
 
-	err = runner.ArvClient.Get("containers", runner.Container.UUID, nil, &runner.Container)
+	err = runner.fetchContainerRecord()
 	if err != nil {
-		err = fmt.Errorf("While getting container record: %v", err)
 		return
 	}
 
@@ -1369,6 +1365,24 @@ func (runner *ContainerRunner) Run() (err error) {
 	return
 }
 
+// Fetch the current container record (uuid = runner.Container.UUID)
+// into runner.Container.
+func (runner *ContainerRunner) fetchContainerRecord() error {
+	reader, err := runner.ArvClient.CallRaw("GET", "containers", runner.Container.UUID, "", nil)
+	if err != nil {
+		return fmt.Errorf("error fetching container record: %v", err)
+	}
+	defer reader.Close()
+
+	dec := json.NewDecoder(reader)
+	dec.UseNumber()
+	err = dec.Decode(&runner.Container)
+	if err != nil {
+		return fmt.Errorf("error decoding container record: %v", err)
+	}
+	return nil
+}
+
 // NewContainerRunner creates a new container runner.
 func NewContainerRunner(api IArvadosClient,
 	kc IKeepClient,