X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/38c4ce8bd5aefed6784d457ed3caf28f279d6de4..fa78e264ef585f02348f4f5c0a7183746a708a8f:/services/keep-web/cache.go

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index 8336b78f9e..5400f694fd 100644
--- a/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
 	"github.com/hashicorp/golang-lru"
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -17,13 +17,7 @@ import (
 const metricsUpdateInterval = time.Second / 10
 
 type cache struct {
-	TTL                  arvados.Duration
-	UUIDTTL              arvados.Duration
-	MaxCollectionEntries int
-	MaxCollectionBytes   int64
-	MaxPermissionEntries int
-	MaxUUIDEntries       int
-
+	config      *arvados.WebDAVCacheConfig
 	registry    *prometheus.Registry
 	metrics     cacheMetrics
 	pdhs        *lru.TwoQueueCache
@@ -110,15 +104,15 @@ type cachedPermission struct {
 
 func (c *cache) setup() {
 	var err error
-	c.pdhs, err = lru.New2Q(c.MaxUUIDEntries)
+	c.pdhs, err = lru.New2Q(c.config.MaxUUIDEntries)
 	if err != nil {
 		panic(err)
 	}
-	c.collections, err = lru.New2Q(c.MaxCollectionEntries)
+	c.collections, err = lru.New2Q(c.config.MaxCollectionEntries)
 	if err != nil {
 		panic(err)
 	}
-	c.permissions, err = lru.New2Q(c.MaxPermissionEntries)
+	c.permissions, err = lru.New2Q(c.config.MaxPermissionEntries)
 	if err != nil {
 		panic(err)
 	}
@@ -157,10 +151,14 @@ func (c *cache) Update(client *arvados.Client, coll arvados.Collection, fs arvad
 	}
 	var updated arvados.Collection
 	defer c.pdhs.Remove(coll.UUID)
-	err := client.RequestAndDecode(&updated, "PATCH", "arvados/v1/collections/"+coll.UUID, client.UpdateBody(coll), nil)
+	err := client.RequestAndDecode(&updated, "PATCH", "arvados/v1/collections/"+coll.UUID, nil, map[string]interface{}{
+		"collection": map[string]string{
+			"manifest_text": coll.ManifestText,
+		},
+	})
 	if err == nil {
 		c.collections.Add(client.AuthToken+"\000"+coll.PortableDataHash, &cachedCollection{
-			expire:     time.Now().Add(time.Duration(c.TTL)),
+			expire:     time.Now().Add(time.Duration(c.config.TTL)),
 			collection: &updated,
 		})
 	}
@@ -217,22 +215,21 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
 		}
 		if current.PortableDataHash == pdh {
 			c.permissions.Add(permKey, &cachedPermission{
-				expire: time.Now().Add(time.Duration(c.TTL)),
+				expire: time.Now().Add(time.Duration(c.config.TTL)),
 			})
 			if pdh != targetID {
 				c.pdhs.Add(targetID, &cachedPDH{
-					expire: time.Now().Add(time.Duration(c.UUIDTTL)),
+					expire: time.Now().Add(time.Duration(c.config.UUIDTTL)),
 					pdh:    pdh,
 				})
 			}
 			return collection, err
-		} else {
-			// PDH changed, but now we know we have
-			// permission -- and maybe we already have the
-			// new PDH in the cache.
-			if coll := c.lookupCollection(arv.ApiToken + "\000" + current.PortableDataHash); coll != nil {
-				return coll, nil
-			}
+		}
+		// PDH changed, but now we know we have
+		// permission -- and maybe we already have the
+		// new PDH in the cache.
+		if coll := c.lookupCollection(arv.ApiToken + "\000" + current.PortableDataHash); coll != nil {
+			return coll, nil
 		}
 	}
 
@@ -242,19 +239,19 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
 	if err != nil {
 		return nil, err
 	}
-	exp := time.Now().Add(time.Duration(c.TTL))
+	exp := time.Now().Add(time.Duration(c.config.TTL))
 	c.permissions.Add(permKey, &cachedPermission{
 		expire: exp,
 	})
 	c.pdhs.Add(targetID, &cachedPDH{
-		expire: time.Now().Add(time.Duration(c.UUIDTTL)),
+		expire: time.Now().Add(time.Duration(c.config.UUIDTTL)),
 		pdh:    collection.PortableDataHash,
 	})
 	c.collections.Add(arv.ApiToken+"\000"+collection.PortableDataHash, &cachedCollection{
 		expire:     exp,
 		collection: collection,
 	})
-	if int64(len(collection.ManifestText)) > c.MaxCollectionBytes/int64(c.MaxCollectionEntries) {
+	if int64(len(collection.ManifestText)) > c.config.MaxCollectionBytes/int64(c.config.MaxCollectionEntries) {
 		go c.pruneCollections()
 	}
 	return collection, nil
@@ -291,7 +288,7 @@ func (c *cache) pruneCollections() {
 		}
 	}
 	for i, k := range keys {
-		if size <= c.MaxCollectionBytes {
+		if size <= c.config.MaxCollectionBytes {
 			break
 		}
 		if expired[i] {