[ARVADOS] updated: 1.3.0-3262-gfa785db30

[Git user]

Summary of changes:
 lib/dispatchcloud/container/queue.go | 6 +++---
 sdk/go/arvados/config.go             | 8 ++++----
 sdk/go/arvados/fs_collection.go      | 9 ++++-----
 sdk/go/keepclient/keepclient.go      | 6 +++---
 services/keep-web/cache.go           | 8 ++++----
 5 files changed, 18 insertions(+), 19 deletions(-)

       via  fa785db309d7b53905d327d6bfcab6445537a75f (commit)
      from  02d601eb27bd5b5217b9ee25869118eae406207c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit fa785db309d7b53905d327d6bfcab6445537a75f
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Oct 5 20:26:10 2020 -0400

    Fix more golint warnings.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/dispatchcloud/container/queue.go b/lib/dispatchcloud/container/queue.go
index a1ff414b7..7a2727c1e 100644
--- a/lib/dispatchcloud/container/queue.go
+++ b/lib/dispatchcloud/container/queue.go
@@ -145,11 +145,11 @@ func (cq *Queue) Forget(uuid string) {
 func (cq *Queue) Get(uuid string) (arvados.Container, bool) {
 	cq.mtx.Lock()
 	defer cq.mtx.Unlock()
-	if ctr, ok := cq.current[uuid]; !ok {
+	ctr, ok := cq.current[uuid]
+	if !ok {
 		return arvados.Container{}, false
-	} else {
-		return ctr.Container, true
 	}
+	return ctr.Container, true
 }
 
 // Entries returns all cache entries, keyed by container UUID.
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 27a4c1de3..a8d601d5f 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -49,12 +49,12 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) {
 			}
 		}
 	}
-	if cc, ok := sc.Clusters[clusterID]; !ok {
+	cc, ok := sc.Clusters[clusterID]
+	if !ok {
 		return nil, fmt.Errorf("cluster %q is not configured", clusterID)
-	} else {
-		cc.ClusterID = clusterID
-		return &cc, nil
 	}
+	cc.ClusterID = clusterID
+	return &cc, nil
 }
 
 type WebDAVCacheConfig struct {
diff --git a/sdk/go/arvados/fs_collection.go b/sdk/go/arvados/fs_collection.go
index d4429f5d7..1de558a1b 100644
--- a/sdk/go/arvados/fs_collection.go
+++ b/sdk/go/arvados/fs_collection.go
@@ -728,12 +728,11 @@ func (dn *dirnode) commitBlock(ctx context.Context, refs []fnSegmentRef, bufsize
 			// it fails, we'll try again next time.
 			close(done)
 			return nil
-		} else {
-			// In sync mode, we proceed regardless of
-			// whether another flush is in progress: It
-			// can't finish before we do, because we hold
-			// fn's lock until we finish our own writes.
 		}
+		// In sync mode, we proceed regardless of
+		// whether another flush is in progress: It
+		// can't finish before we do, because we hold
+		// fn's lock until we finish our own writes.
 		seg.flushing = done
 		offsets = append(offsets, len(block))
 		if len(refs) == 1 {
diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index 8eff377ce..e65baa3b3 100644
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -191,11 +191,11 @@ func (kc *KeepClient) PutB(buffer []byte) (string, int, error) {
 //
 // If the block hash and data size are known, PutHR is more efficient.
 func (kc *KeepClient) PutR(r io.Reader) (locator string, replicas int, err error) {
-	if buffer, err := ioutil.ReadAll(r); err != nil {
+	buffer, err := ioutil.ReadAll(r)
+	if err != nil {
 		return "", 0, err
-	} else {
-		return kc.PutB(buffer)
 	}
+	return kc.PutB(buffer)
 }
 
 func (kc *KeepClient) getOrHead(method string, locator string, header http.Header) (io.ReadCloser, int64, string, http.Header, error) {
diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index 5400f694f..eeb78ad90 100644
--- a/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@ -144,14 +144,14 @@ var selectPDH = map[string]interface{}{
 func (c *cache) Update(client *arvados.Client, coll arvados.Collection, fs arvados.CollectionFileSystem) error {
 	c.setupOnce.Do(c.setup)
 
-	if m, err := fs.MarshalManifest("."); err != nil || m == coll.ManifestText {
+	m, err := fs.MarshalManifest(".")
+	if err != nil || m == coll.ManifestText {
 		return err
-	} else {
-		coll.ManifestText = m
 	}
+	coll.ManifestText = m
 	var updated arvados.Collection
 	defer c.pdhs.Remove(coll.UUID)
-	err := client.RequestAndDecode(&updated, "PATCH", "arvados/v1/collections/"+coll.UUID, nil, map[string]interface{}{
+	err = client.RequestAndDecode(&updated, "PATCH", "arvados/v1/collections/"+coll.UUID, nil, map[string]interface{}{
 		"collection": map[string]string{
 			"manifest_text": coll.ManifestText,
 		},

-----------------------------------------------------------------------


hooks/post-receive
--