[arvados] updated: 2.1.0-2871-gf1ec6199f
git repository hosting
git at public.arvados.org
Tue Sep 20 13:54:37 UTC 2022
Summary of changes:
doc/admin/upgrading.html.textile.liquid | 6 ++++++
lib/config/config.default.yml | 16 ++++++----------
lib/config/deprecated.go | 9 ---------
lib/config/deprecated_test.go | 3 ---
sdk/go/arvados/config.go | 11 ++++-------
sdk/go/arvados/fs_site.go | 8 ++++----
6 files changed, 20 insertions(+), 33 deletions(-)
via f1ec6199fbe9b6abdba3a9eba95eda7b46eb5265 (commit)
via b8fe3b514556be00f877d63d957368727b608a61 (commit)
via 6115e62fba5208f53ef99cf7f3096e53e9290490 (commit)
from 25162c18b4290f7763cd545f2d94d96650ebc9d9 (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 f1ec6199fbe9b6abdba3a9eba95eda7b46eb5265
Author: Tom Clegg <tom at curii.com>
Date: Tue Sep 20 09:54:11 2022 -0400
19362: Remove obsolete config entries.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index 09d160843..b034ba35d 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -32,10 +32,12 @@ h2(#main). development main (as of 2022-08-09)
"previous: Upgrading to 2.4.2":#v2_4_2
-h3. Renamed keep-web metrics
+h3. Renamed keep-web metrics and WebDAV configs
Metrics previously reported by keep-web (@arvados_keepweb_collectioncache_requests@, @..._hits@, @..._pdh_hits@, @..._api_calls@, @..._cached_manifests@, and @arvados_keepweb_sessions_cached_collection_bytes@) have been replaced with @arvados_keepweb_cached_session_bytes at .
+The config entries @Collections.WebDAVCache.UUIDTTL@, @...MaxCollectionEntries@, and @...MaxUUIDEntries@ are no longer used, and should be removed from your config file.
+
h2(#v2_4_2). v2.4.2 (2022-08-09)
"previous: Upgrading to 2.4.1":#v2_4_1
diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index b23c6a127..444398bc3 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -611,21 +611,17 @@ Clusters:
# Time to cache manifests, permission checks, and sessions.
TTL: 300s
- # Time to cache collection state.
- UUIDTTL: 5s
-
# Block cache entries. Each block consumes up to 64 MiB RAM.
MaxBlockEntries: 20
- # Collection cache entries.
- MaxCollectionEntries: 1000
-
- # Approximate memory limit (in bytes) for collection cache.
+ # Approximate memory limit (in bytes) for session cache.
+ #
+ # Note this applies to the in-memory representation of
+ # projects and collections -- metadata, block locators,
+ # filenames, etc. -- excluding cached file content, which is
+ # limited by MaxBlockEntries.
MaxCollectionBytes: 100000000
- # UUID cache entries.
- MaxUUIDEntries: 1000
-
# Persistent sessions.
MaxSessions: 100
diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index c0a7921b3..d5c09d670 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -494,18 +494,9 @@ func (ldr *Loader) loadOldKeepWebConfig(cfg *arvados.Config) error {
if oc.Cache.TTL != nil {
cluster.Collections.WebDAVCache.TTL = *oc.Cache.TTL
}
- if oc.Cache.UUIDTTL != nil {
- cluster.Collections.WebDAVCache.UUIDTTL = *oc.Cache.UUIDTTL
- }
- if oc.Cache.MaxCollectionEntries != nil {
- cluster.Collections.WebDAVCache.MaxCollectionEntries = *oc.Cache.MaxCollectionEntries
- }
if oc.Cache.MaxCollectionBytes != nil {
cluster.Collections.WebDAVCache.MaxCollectionBytes = *oc.Cache.MaxCollectionBytes
}
- if oc.Cache.MaxUUIDEntries != nil {
- cluster.Collections.WebDAVCache.MaxUUIDEntries = *oc.Cache.MaxUUIDEntries
- }
if oc.AnonymousTokens != nil {
if len(*oc.AnonymousTokens) > 0 {
cluster.Users.AnonymousUserToken = (*oc.AnonymousTokens)[0]
diff --git a/lib/config/deprecated_test.go b/lib/config/deprecated_test.go
index 4206ef577..f9b1d1661 100644
--- a/lib/config/deprecated_test.go
+++ b/lib/config/deprecated_test.go
@@ -199,10 +199,7 @@ func (s *LoadSuite) TestLegacyKeepWebConfig(c *check.C) {
c.Check(cluster.SystemRootToken, check.Equals, "abcdefg")
c.Check(cluster.Collections.WebDAVCache.TTL, check.Equals, arvados.Duration(60*time.Second))
- 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.MaxUUIDEntries, check.Equals, 100)
c.Check(cluster.Services.WebDAVDownload.ExternalURL, check.Equals, arvados.URL{Host: "download.example.com", Path: "/"})
c.Check(cluster.Services.WebDAVDownload.InternalURLs[arvados.URL{Host: ":80"}], check.NotNil)
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 6d8f39dfb..eb564cb61 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -61,13 +61,10 @@ func (sc *Config) GetCluster(clusterID string) (*Cluster, error) {
}
type WebDAVCacheConfig struct {
- TTL Duration
- UUIDTTL Duration
- MaxBlockEntries int
- MaxCollectionEntries int
- MaxCollectionBytes int64
- MaxUUIDEntries int
- MaxSessions int
+ TTL Duration
+ MaxBlockEntries int
+ MaxCollectionBytes int64
+ MaxSessions int
}
type UploadDownloadPermission struct {
commit b8fe3b514556be00f877d63d957368727b608a61
Author: Tom Clegg <tom at curii.com>
Date: Mon Sep 19 15:15:39 2022 -0400
19362: Add release note about changed metrics.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index d0dc7cbd8..09d160843 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -32,6 +32,10 @@ h2(#main). development main (as of 2022-08-09)
"previous: Upgrading to 2.4.2":#v2_4_2
+h3. Renamed keep-web metrics
+
+Metrics previously reported by keep-web (@arvados_keepweb_collectioncache_requests@, @..._hits@, @..._pdh_hits@, @..._api_calls@, @..._cached_manifests@, and @arvados_keepweb_sessions_cached_collection_bytes@) have been replaced with @arvados_keepweb_cached_session_bytes at .
+
h2(#v2_4_2). v2.4.2 (2022-08-09)
"previous: Upgrading to 2.4.1":#v2_4_1
commit 6115e62fba5208f53ef99cf7f3096e53e9290490
Author: Tom Clegg <tom at curii.com>
Date: Mon Sep 19 15:15:25 2022 -0400
19362: Update comment.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/sdk/go/arvados/fs_site.go b/sdk/go/arvados/fs_site.go
index eed49296e..531d7968a 100644
--- a/sdk/go/arvados/fs_site.go
+++ b/sdk/go/arvados/fs_site.go
@@ -158,10 +158,10 @@ func (fs *customFileSystem) mountCollection(parent inode, id string) (inode, err
if len(id) != 27 {
// This means id is a PDH, and controller/railsapi
// returned one of (possibly) many collections with
- // that PDH. We don't want to expose (e.g., through
- // Sys()) the metadata from that collection -- only
- // the fields that are common to all matching
- // collections, i.e., PDH and manifest.
+ // that PDH. Even if controller returns more fields
+ // besides PDH and manifest text (which are equal for
+ // all matching collections), we don't want to expose
+ // them (e.g., through Sys()).
coll = Collection{
PortableDataHash: coll.PortableDataHash,
ManifestText: coll.ManifestText,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list