From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Sat, 14 Oct 2017 15:58:14 +0000 (-0400)
Subject: 12447: Use ReadFull().  Use goimport for import formatting.
X-Git-Tag: 1.1.0~9^2~4
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a8d59274b32098abcc6b36b46ae354de3dcd13ad

12447: Use ReadFull().  Use goimport for import formatting.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---

diff --git a/sdk/go/keepclient/block_cache.go b/sdk/go/keepclient/block_cache.go
index 23fd331d1f..ca19f41bdc 100644
--- a/sdk/go/keepclient/block_cache.go
+++ b/sdk/go/keepclient/block_cache.go
@@ -5,7 +5,6 @@
 package keepclient
 
 import (
-	"bytes"
 	"io"
 	"sort"
 	"sync"
@@ -65,10 +64,11 @@ func (c *BlockCache) Get(kc *KeepClient, locator string) ([]byte, error) {
 		}
 		c.cache[cacheKey] = b
 		go func() {
-			rdr, _, _, err := kc.Get(locator)
-			data := bytes.NewBuffer(make([]byte, 0, BLOCKSIZE))
+			rdr, size, _, err := kc.Get(locator)
+			var data []byte
 			if err == nil {
-				_, err = io.Copy(data, rdr)
+				data := make([]byte, size, BLOCKSIZE)
+				_, err = io.ReadFull(rdr, data)
 				err2 := rdr.Close()
 				if err == nil {
 					err = err2
diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 8d437a8f20..7d5ee7eba9 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -11,11 +11,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"git.curoverse.com/arvados.git/lib/crunchstat"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/keepclient"
-	"git.curoverse.com/arvados.git/sdk/go/manifest"
 	"io"
 	"io/ioutil"
 	"log"
@@ -32,6 +27,12 @@ import (
 	"syscall"
 	"time"
 
+	"git.curoverse.com/arvados.git/lib/crunchstat"
+	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+	"git.curoverse.com/arvados.git/sdk/go/keepclient"
+	"git.curoverse.com/arvados.git/sdk/go/manifest"
+
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
 	dockernetwork "github.com/docker/docker/api/types/network"