Merge branch 'main' into 19582-aws-s3v2-driver

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index 1fe6745b94ca643ef8eaf0eeba2e59c90bdd6823..5fbbda2aef1ac171eb1d743327be2ef33c7561c4 100644 (file)
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -29,10 +29,15 @@ TODO: extract this information based on git commit messages and generate changel
 </notextile>
 
 
-h2(#main). development main (as of 2022-10-14)
+h2(#main). development main (as of 2022-10-31)
 
 "previous: Upgrading to 2.4.3":#v2_4_3
 
+h3. New keepstore S3 driver enabled by default
+
+A more actively maintained S3 client library is now enabled by default for keeepstore services. The previous driver is still available for use in case of unknown issues. To use the old driver, set @DriverParameters.UseAWSS3v2Driver@ to @false@ on the appropriate @Volumes@ config entries.
+h2(#main). development main (as of 2022-10-14)
+
 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@.

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 559b57c8c4d5d4bf3fa0444628d880485f75daa6..5e46c290da6424f15870ac4bb6cf03731e21e338 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1499,7 +1499,7 @@ Clusters:
           RaceWindow: 24h
           PrefixLength: 0
           # Use aws-s3-go (v2) instead of goamz
-          UseAWSS3v2Driver: false
+          UseAWSS3v2Driver: true
 
           # For S3 driver, potentially unsafe tuning parameter,
           # intentionally excluded from main documentation.

diff --git a/services/keepstore/s3aws_volume.go b/services/keepstore/s3aws_volume.go
index 6205da5beb258dd8a9a354256715744c821794a6..f7cff6d33ea4d7c764ba74f06e49c8815f021fa9 100644 (file)
--- a/services/keepstore/s3aws_volume.go
+++ b/services/keepstore/s3aws_volume.go
@@ -62,6 +62,8 @@ type s3AWSbucket struct {
 // aws-sdk-go based on the UseAWSS3v2Driver feature flag
 func chooseS3VolumeDriver(cluster *arvados.Cluster, volume arvados.Volume, logger logrus.FieldLogger, metrics *volumeMetricsVecs) (Volume, error) {
        v := &S3Volume{cluster: cluster, volume: volume, metrics: metrics}
+       // Default value will be overriden if it happens to be defined in the config
+       v.S3VolumeDriverParameters.UseAWSS3v2Driver = true
        err := json.Unmarshal(volume.DriverParameters, v)
        if err != nil {
                return nil, err