X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/72e22b49ec2721d3a1369da768d3d74fa9c079c3..d084ca24b06c598271844d2ba4c8c40f251c0999:/services/keep-web/cache.go

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index ab7c65310b..d72effc075 100644
--- a/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@ -1,7 +1,10 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
-	"fmt"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -42,7 +45,7 @@ type cachedPDH struct {
 
 type cachedCollection struct {
 	expire     time.Time
-	collection map[string]interface{}
+	collection *arvados.Collection
 }
 
 type cachedPermission struct {
@@ -82,7 +85,7 @@ func (c *cache) Stats() cacheStats {
 	}
 }
 
-func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceReload bool) (map[string]interface{}, error) {
+func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceReload bool) (*arvados.Collection, error) {
 	c.setupOnce.Do(c.setup)
 
 	atomic.AddUint64(&c.stats.Requests, 1)
@@ -103,7 +106,6 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
 	var pdh string
 	if arvadosclient.PDHMatch(targetID) {
 		pdh = targetID
-	} else if forceReload {
 	} else if ent, cached := c.pdhs.Get(targetID); cached {
 		ent := ent.(*cachedPDH)
 		if ent.expire.Before(time.Now()) {
@@ -114,7 +116,7 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
 		}
 	}
 
-	var collection map[string]interface{}
+	var collection *arvados.Collection
 	if pdh != "" {
 		collection = c.lookupCollection(pdh)
 	}
@@ -127,14 +129,12 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
 		// _and_ the current token has permission, we can
 		// use our cached manifest.
 		atomic.AddUint64(&c.stats.APICalls, 1)
-		var current map[string]interface{}
+		var current arvados.Collection
 		err := arv.Get("collections", targetID, selectPDH, &current)
 		if err != nil {
 			return nil, err
 		}
-		if checkPDH, ok := current["portable_data_hash"].(string); !ok {
-			return nil, fmt.Errorf("API response for %q had no PDH", targetID)
-		} else if checkPDH == pdh {
+		if current.PortableDataHash == pdh {
 			exp := time.Now().Add(time.Duration(c.TTL))
 			c.permissions.Add(permKey, &cachedPermission{
 				expire: exp,
@@ -150,7 +150,7 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
 			// PDH changed, but now we know we have
 			// permission -- and maybe we already have the
 			// new PDH in the cache.
-			if coll := c.lookupCollection(checkPDH); coll != nil {
+			if coll := c.lookupCollection(current.PortableDataHash); coll != nil {
 				return coll, nil
 			}
 		}
@@ -162,25 +162,22 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
 	if err != nil {
 		return nil, err
 	}
-	pdh, ok := collection["portable_data_hash"].(string)
-	if !ok {
-		return nil, fmt.Errorf("API response for %q had no PDH", targetID)
-	}
 	exp := time.Now().Add(time.Duration(c.TTL))
 	c.permissions.Add(permKey, &cachedPermission{
 		expire: exp,
 	})
 	c.pdhs.Add(targetID, &cachedPDH{
 		expire: exp,
-		pdh:    pdh,
+		pdh:    collection.PortableDataHash,
 	})
-	c.collections.Add(pdh, &cachedCollection{
-		expire:     exp,
-		collection: collection,
-	})
-	if int64(len(collection["manifest_text"].(string))) > c.MaxCollectionBytes/int64(c.MaxCollectionEntries) {
-		go c.pruneCollections()
-	}
+	// Disabled, see #11945
+	// c.collections.Add(collection.PortableDataHash, &cachedCollection{
+	// 	expire:     exp,
+	// 	collection: collection,
+	// })
+	// if int64(len(collection.ManifestText)) > c.MaxCollectionBytes/int64(c.MaxCollectionEntries) {
+	// 	go c.pruneCollections()
+	// }
 	return collection, nil
 }
 
@@ -203,7 +200,7 @@ func (c *cache) pruneCollections() {
 			continue
 		}
 		ent := v.(*cachedCollection)
-		n := len(ent.collection["manifest_text"].(string))
+		n := len(ent.collection.ManifestText)
 		size += int64(n)
 		entsize[i] = n
 		expired[i] = ent.expire.Before(now)
@@ -236,12 +233,12 @@ func (c *cache) collectionBytes() uint64 {
 		if !ok {
 			continue
 		}
-		size += uint64(len(v.(*cachedCollection).collection["manifest_text"].(string)))
+		size += uint64(len(v.(*cachedCollection).collection.ManifestText))
 	}
 	return size
 }
 
-func (c *cache) lookupCollection(pdh string) map[string]interface{} {
+func (c *cache) lookupCollection(pdh string) *arvados.Collection {
 	if pdh == "" {
 		return nil
 	} else if ent, cached := c.collections.Get(pdh); !cached {