[ARVADOS] updated: 2.1.0-1368-g8e6d3b18c

[Git user]

Summary of changes:
 lib/config/config.default.yml     |   3 -
 lib/config/deprecated.go          |   4 -
 lib/config/deprecated_test.go     |   2 -
 lib/config/generated_config.go    |   3 -
 sdk/go/arvados/config.go          |   1 -
 services/keep-web/cache.go        | 163 ++++++++++++++++++++------------------
 services/keep-web/cache_test.go   |  15 ++--
 services/keep-web/handler_test.go |  14 ++--
 services/keep-web/main.go         |   5 +-
 services/keep-web/server_test.go  |   3 +-
 services/keep-web/status_test.go  |   3 +-
 11 files changed, 104 insertions(+), 112 deletions(-)

       via  8e6d3b18cf24be5bf37526b8d1a2bb063b9a550c (commit)
       via  8d496518cc371fc9dbad214dce79dc9e13f41fdd (commit)
       via  02b35f7480e2792377e2ed23f740fff4b53badb9 (commit)
       via  e4752e29dd45110b70d408e5b648cba8357bb5ea (commit)
       via  38489133d0d3ba3797447272edea7f618cf352df (commit)
      from  e0d89f524f6ebdb5dc730402ff3c61e6d8160c9e (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 8e6d3b18cf24be5bf37526b8d1a2bb063b9a550c
Merge: e0d89f524 8d496518c
Author: Tom Clegg <tom at curii.com>
Date:   Mon Sep 20 10:12:05 2021 -0400

    Merge branch '18051-webdav-cache'
    
    refs #18051
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>


commit 8d496518cc371fc9dbad214dce79dc9e13f41fdd
Author: Tom Clegg <tom at curii.com>
Date:   Thu Sep 16 10:05:08 2021 -0400

    18051: Remove unused MaxPermissionEntries config.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 2b474ffdb..4bcffd909 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -553,9 +553,6 @@ Clusters:
         # Approximate memory limit (in bytes) for collection cache.
         MaxCollectionBytes: 100000000
 
-        # Permission cache entries.
-        MaxPermissionEntries: 1000
-
         # UUID cache entries.
         MaxUUIDEntries: 1000
 
diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index efc9f0837..e9c5da106 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -449,7 +449,6 @@ type oldKeepWebConfig struct {
 		UUIDTTL              *arvados.Duration
 		MaxCollectionEntries *int
 		MaxCollectionBytes   *int64
-		MaxPermissionEntries *int
 		MaxUUIDEntries       *int
 	}
 
@@ -505,9 +504,6 @@ func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error {
 	if oc.Cache.MaxCollectionBytes != nil {
 		cluster.Collections.WebDAVCache.MaxCollectionBytes = *oc.Cache.MaxCollectionBytes
 	}
-	if oc.Cache.MaxPermissionEntries != nil {
-		cluster.Collections.WebDAVCache.MaxPermissionEntries = *oc.Cache.MaxPermissionEntries
-	}
 	if oc.Cache.MaxUUIDEntries != nil {
 		cluster.Collections.WebDAVCache.MaxUUIDEntries = *oc.Cache.MaxUUIDEntries
 	}
diff --git a/lib/config/deprecated_test.go b/lib/config/deprecated_test.go
index 7cb169c61..595e4c9ca 100644
--- a/lib/config/deprecated_test.go
+++ b/lib/config/deprecated_test.go
@@ -185,7 +185,6 @@ func (s *LoadSuite) TestLegacyKeepWebConfig(c *check.C) {
 		"UUIDTTL": "1s",
 		"MaxCollectionEntries": 42,
 		"MaxCollectionBytes": 1234567890,
-		"MaxPermissionEntries": 100,
 		"MaxUUIDEntries": 100
 	},
 	"ManagementToken": "xyzzy"
@@ -201,7 +200,6 @@ func (s *LoadSuite) TestLegacyKeepWebConfig(c *check.C) {
 	c.Check(cluster.Collections.WebDAVCache.UUIDTTL, check.Equals, arvados.Duration(time.Second))
 	c.Check(cluster.Collections.WebDAVCache.MaxCollectionEntries, check.Equals, 42)
 	c.Check(cluster.Collections.WebDAVCache.MaxCollectionBytes, check.Equals, int64(1234567890))
-	c.Check(cluster.Collections.WebDAVCache.MaxPermissionEntries, check.Equals, 100)
 	c.Check(cluster.Collections.WebDAVCache.MaxUUIDEntries, check.Equals, 100)
 
 	c.Check(cluster.Services.WebDAVDownload.ExternalURL, check.Equals, arvados.URL{Host: "download.example.com", Path: "/"})
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 2d47addff..fd07592e9 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -559,9 +559,6 @@ Clusters:
         # Approximate memory limit (in bytes) for collection cache.
         MaxCollectionBytes: 100000000
 
-        # Permission cache entries.
-        MaxPermissionEntries: 1000
-
         # UUID cache entries.
         MaxUUIDEntries: 1000
 
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 4a7c18b3e..ad9a4da03 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -63,7 +63,6 @@ type WebDAVCacheConfig struct {
 	MaxBlockEntries      int
 	MaxCollectionEntries int
 	MaxCollectionBytes   int64
-	MaxPermissionEntries int
 	MaxUUIDEntries       int
 	MaxSessions          int
 }

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


hooks/post-receive
--