From 8d496518cc371fc9dbad214dce79dc9e13f41fdd Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 16 Sep 2021 10:05:08 -0400 Subject: [PATCH] 18051: Remove unused MaxPermissionEntries config. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- 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 - 5 files changed, 13 deletions(-) diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml index 2b474ffdb0..4bcffd9095 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 efc9f0837e..e9c5da1064 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 7cb169c618..595e4c9cad 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 2d47addff7..fd07592e98 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 4a7c18b3e0..ad9a4da03c 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 } -- 2.30.2