11809: Rename FooEntries -> MaxFooEntries in cache config.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index 26f6627424ce605d38675f5e6f1b7fa4ac53f7a8..b9e3e3e01fab46e1739e6d1efb4698f346807d3e 100644 (file)
--- a/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@ -12,11 +12,11 @@ import (
 )
 
 type cache struct {
-       TTL               arvados.Duration
-       CollectionEntries int
-       CollectionBytes   int64
-       PermissionEntries int
-       UUIDEntries       int
+       TTL                  arvados.Duration
+       MaxCollectionEntries int
+       MaxCollectionBytes   int64
+       MaxPermissionEntries int
+       MaxUUIDEntries       int
 
        stats       cacheStats
        pdhs        *lru.TwoQueueCache
@@ -51,15 +51,15 @@ type cachedPermission struct {
 
 func (c *cache) setup() {
        var err error
-       c.pdhs, err = lru.New2Q(c.UUIDEntries)
+       c.pdhs, err = lru.New2Q(c.MaxUUIDEntries)
        if err != nil {
                panic(err)
        }
-       c.collections, err = lru.New2Q(c.CollectionEntries)
+       c.collections, err = lru.New2Q(c.MaxCollectionEntries)
        if err != nil {
                panic(err)
        }
-       c.permissions, err = lru.New2Q(c.PermissionEntries)
+       c.permissions, err = lru.New2Q(c.MaxPermissionEntries)
        if err != nil {
                panic(err)
        }
@@ -175,7 +175,7 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo
                expire:     exp,
                collection: collection,
        })
-       if int64(len(collection["manifest_text"].(string))) > c.CollectionBytes/int64(c.CollectionEntries) {
+       if int64(len(collection["manifest_text"].(string))) > c.MaxCollectionBytes/int64(c.MaxCollectionEntries) {
                c.pruneCollections()
        }
        return collection, nil
@@ -212,7 +212,7 @@ func (c *cache) pruneCollections() {
                }
        }
        for i, k := range keys {
-               if size <= c.CollectionBytes {
+               if size <= c.MaxCollectionBytes {
                        break
                }
                if expired[i] {

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index bcdcd8b6d7316c0f8fd9ecdc74f0e40d38d46679..0cb62d1a25a52e3eff5637e0ff5a360fc4264bb7 100644 (file)
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -37,11 +37,11 @@ func DefaultConfig() *Config {
        return &Config{
                Listen: ":80",
                Cache: cache{
-                       TTL:               arvados.Duration(5 * time.Minute),
-                       CollectionEntries: 100,
-                       CollectionBytes:   100000000,
-                       PermissionEntries: 100,
-                       UUIDEntries:       100,
+                       TTL:                  arvados.Duration(5 * time.Minute),
+                       MaxCollectionEntries: 100,
+                       MaxCollectionBytes:   100000000,
+                       MaxPermissionEntries: 100,
+                       MaxUUIDEntries:       100,
                },
        }
 }

diff --git a/services/keep-web/usage.go b/services/keep-web/usage.go
index b854f5314c479fe8671caa29b773255b6eefe849..603dd4dd2c63a73cc6e5b8b536cca888ae943d93 100644 (file)
--- a/services/keep-web/usage.go
+++ b/services/keep-web/usage.go
@@ -71,19 +71,19 @@ Cache.TTL:
 
     Maximum time to cache collection data and permission checks.
 
-Cache.CollectionEntries:
+Cache.MaxCollectionEntries:
 
     Maximum number of collection cache entries.
 
-Cache.CollectionBytes:
+Cache.MaxCollectionBytes:
 
     Approximate memory limit for collection cache.
 
-Cache.PermissionEntries:
+Cache.MaxPermissionEntries:
 
     Maximum number of permission cache entries.
 
-Cache.UUIDEntries:
+Cache.MaxUUIDEntries:
 
     Maximum number of UUID cache entries.