10998: Adds Collections.WebDAVCache.MaxBlockEntries config knob.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 2c0b53016aee6e767462b77221967bc0eeb79ae1..dfdd0310448826174b83c1e005d2d22dcce9e062 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -395,6 +395,7 @@ Clusters:
       # Cache parameters for WebDAV content serving:
       # * TTL: Maximum time to cache manifests and permission checks.
       # * UUIDTTL: Maximum time to cache collection state.
+      # * MaxBlockEntries: Maximum number of block cache entries.
       # * MaxCollectionEntries: Maximum number of collection cache entries.
       # * MaxCollectionBytes: Approximate memory limit for collection cache.
       # * MaxPermissionEntries: Maximum number of permission cache entries.
@@ -402,6 +403,7 @@ Clusters:
       WebDAVCache:
         TTL: 300s
         UUIDTTL: 5s
+        MaxBlockEntries:      4
         MaxCollectionEntries: 1000
         MaxCollectionBytes:   100000000
         MaxPermissionEntries: 1000

diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 5341a256c14da886b3f0a0293ba6d1f380e0f9fc..6cb8bf81aee3607d6bce79986e466d0b86eb807e 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -401,6 +401,7 @@ Clusters:
       # Cache parameters for WebDAV content serving:
       # * TTL: Maximum time to cache manifests and permission checks.
       # * UUIDTTL: Maximum time to cache collection state.
+      # * MaxBlockEntries: Maximum number of block cache entries.
       # * MaxCollectionEntries: Maximum number of collection cache entries.
       # * MaxCollectionBytes: Approximate memory limit for collection cache.
       # * MaxPermissionEntries: Maximum number of permission cache entries.
@@ -408,6 +409,7 @@ Clusters:
       WebDAVCache:
         TTL: 300s
         UUIDTTL: 5s
+        MaxBlockEntries:      4
         MaxCollectionEntries: 1000
         MaxCollectionBytes:   100000000
         MaxPermissionEntries: 1000

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index db4e6dcd89a3e858f67eb7e4ded3531a19f2d3b4..02043fb6d192e63a0e438b9f12981efbd259df70 100644 (file)
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -60,6 +60,7 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) {
 type WebDAVCacheConfig struct {
        TTL                  Duration
        UUIDTTL              Duration
+       MaxBlockEntries      int
        MaxCollectionEntries int
        MaxCollectionBytes   int64
        MaxPermissionEntries int