[arvados] updated: 2.1.0-2966-g99d3381ef

git repository hosting git at public.arvados.org
Tue Oct 18 15:18:17 UTC 2022


Summary of changes:
 doc/admin/upgrading.html.textile.liquid | 4 ++++
 sdk/go/arvados/duration.go              | 8 ++++++++
 sdk/python/tests/run_test_server.py     | 3 +++
 3 files changed, 15 insertions(+)

       via  99d3381ef145368617ecf92532201d79c9bb0ea7 (commit)
       via  3282886a07b17773d4f8ad47209978e50bed7e92 (commit)
      from  cbf20e690f71440eb725e7280eb14b827032d9a4 (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 99d3381ef145368617ecf92532201d79c9bb0ea7
Author: Tom Clegg <tom at curii.com>
Date:   Tue Oct 18 11:17:02 2022 -0400

    18863: Disable container log sweep in integration test server cfg.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/sdk/go/arvados/duration.go b/sdk/go/arvados/duration.go
index c922f0a30..9df210ccb 100644
--- a/sdk/go/arvados/duration.go
+++ b/sdk/go/arvados/duration.go
@@ -5,6 +5,7 @@
 package arvados
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -17,6 +18,13 @@ type Duration time.Duration
 
 // UnmarshalJSON implements json.Unmarshaler.
 func (d *Duration) UnmarshalJSON(data []byte) error {
+	if bytes.Equal(data, []byte(`"0"`)) || bytes.Equal(data, []byte(`0`)) {
+		// Unitless 0 is not accepted by ParseDuration, but we
+		// accept it as a reasonable spelling of 0
+		// nanoseconds.
+		*d = 0
+		return nil
+	}
 	if data[0] == '"' {
 		return d.Set(string(data[1 : len(data)-1]))
 	}
diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index e5d1d8fa3..2bb20ca5d 100644
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -833,6 +833,9 @@ def setup_config():
                         "GitInternalDir": os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'internal.git'),
                     },
                     "LocalKeepBlobBuffersPerVCPU": 0,
+                    "Logging": {
+                        "SweepInterval": 0, # disable, otherwise test cases can't acquire dblock
+                    },
                     "SupportedDockerImageFormats": {"v1": {}},
                     "ShellAccess": {
                         "Admin": True,

commit 3282886a07b17773d4f8ad47209978e50bed7e92
Author: Tom Clegg <tom at curii.com>
Date:   Mon Oct 17 15:31:14 2022 -0400

    18863: Add upgrade note.
    
    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 ef93b3f00..1fe6745b9 100644
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -33,6 +33,10 @@ h2(#main). development main (as of 2022-10-14)
 
 "previous: Upgrading to 2.4.3":#v2_4_3
 
+h3. Old container logs are automatically deleted from PostgreSQL
+
+Cached copies of log entries from containers that finished more than 1 month ago are now deleted automatically (this only affects the "live" logs saved in the PostgreSQL database, not log collections saved in Keep). If you have an existing cron job that runs @rake db:delete_old_container_logs@, you can remove it. See configuration options @Containers.Logging.MaxAge@ and @Containers.Logging.SweepInterval at .
+
 h3. Fixed salt installer template file to support container shell access
 
 If you manage your cluster using the salt installer, you may want to update it to the latest version, use the appropriate @config_examples@ subdirectory and re-reploy with your custom @local.params@ file so that the @arvados-controller@'s @nginx@ configuration file gets fixed.

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list