Add S3_RETRY_MODE with standard and adaptive, fix #1097, fix testflows

Signed-off-by: Slach <bloodjazman@gmail.com>

Author: Slach

ChangeLog.md

@@ -2,15 +2,16 @@
 
 IMPROVEMENTS
 
+- Add `S3_RETRY_MODE` with `standard` and `adaptive`, fix [1097](https://github.com/Altinity/clickhouse-backup/issues/1097)
 - Add `server_side_encryption_kms_bucket_key_enabled` support for backup/restore s3 object disks, fix [1092](https://github.com/Altinity/clickhouse-backup/issues/1092)
 - Add `AZBLOB_ASSUME_CONTAINER_EXISTS` config option, fix [1094](https://github.com/Altinity/clickhouse-backup/pull/1094), thanks @atykhyy
 - Improve Azure authentication mechanism, fix [1047](https://github.com/Altinity/clickhouse-backup/issues/1047), thanks @dnovvak
 - Add option `--skip-projections` to `create`, `upload`, `restore` commands, with table pattern to allow make backup
   without projection, restore supported only in `clickhouse-server` 24.3+, fix [861](https://github.com/Altinity/clickhouse-backup/issues/861)
-- remove `S3_PART_SIZE` and `AZBLOB_BUFFER_SIZE` parameter from configuration and significant decrease memory usage
+- Remove `S3_PART_SIZE` and `AZBLOB_BUFFER_SIZE` parameter from configuration and significant decrease memory usage
   during upload and download, fix [854](https://github.com/Altinity/clickhouse-backup/issues/854)
-- add `--configs-only` and `--rbac-only` options to `upload` and `download` command, fix [1042](https://github.com/Altinity/clickhouse-backup/issues/1042)
-- add support `\` and `/` special characters in table name and database name, fix [1091](https://github.com/Altinity/clickhouse-backup/issues/1091)
+- Add `--configs-only` and `--rbac-only` options to `upload` and `download` command, fix [1042](https://github.com/Altinity/clickhouse-backup/issues/1042)
+- Add support `\` and `/` special characters in table name and database name, fix [1091](https://github.com/Altinity/clickhouse-backup/issues/1091)
 
 BUG FIXES
 

pkg/config/config.go

@@ -3,6 +3,7 @@ package config
 import (
 	"crypto/tls"
 	"fmt"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"math"
 	"os"
 	"regexp"
@@ -148,6 +149,7 @@ type S3Config struct {
 	ObjectLabels            map[string]string `yaml:"object_labels" envconfig:"S3_OBJECT_LABELS"`
 	RequestPayer            string            `yaml:"request_payer" envconfig:"S3_REQUEST_PAYER"`
 	CheckSumAlgorithm       string            `yaml:"check_sum_algorithm" envconfig:"S3_CHECKSUM_ALGORITHM"`
+	RetryMode               string            `yaml:"retry_mode" envconfig:"S3_RETRY_MODE"`
 	Debug                   bool              `yaml:"debug" envconfig:"S3_DEBUG"`
 }
 
@@ -373,6 +375,11 @@ func LoadConfig(configLocation string) (*Config, error) {
 }
 
 func ValidateConfig(cfg *Config) error {
+	if cfg.General.RemoteStorage == "s3" {
+		if _, err := aws.ParseRetryMode(cfg.S3.RetryMode); err != nil {
+			return err
+		}
+	}
 	if cfg.GetCompressionFormat() == "unknown" {
 		return fmt.Errorf("'%s' is unknown remote storage", cfg.General.RemoteStorage)
 	}
@@ -601,6 +608,7 @@ func DefaultConfig() *Config {
 			StorageClass:            string(s3types.StorageClassStandard),
 			Concurrency:             int(downloadConcurrency + 1),
 			MaxPartsCount:           4000,
+			RetryMode:               string(aws.RetryModeStandard),
 		},
 		GCS: GCSConfig{
 			CompressionLevel:  1,

test/testflows/clickhouse_backup/tests/cli.py

@@ -153,6 +153,7 @@ def list_local_remote(self):
     """
     backup = self.context.backup
     name_prefix = "cli_list"
+    location_index = 3
 
     try:
         with Given("create a local backup"):
@@ -175,7 +176,7 @@ def list_local_remote(self):
                 for line in data:
                     debug(line)
                     total_backups += 1
-                    assert line[4] in ("local", "remote"), error()
+                    assert line[location_index] in ("local", "remote"), error()
 
             with By("check local backups"):
                 local_backups = 0
@@ -187,7 +188,7 @@ def list_local_remote(self):
                 for line in data:
                     debug(line)
                     local_backups += 1
-                    assert line[4] == "local", error()
+                    assert line[location_index] == "local", error()
 
             with By("check remote backups"):
                 remote_backups = 0
@@ -199,7 +200,7 @@ def list_local_remote(self):
                 for line in data:
                     debug(line)
                     remote_backups += 1
-                    assert line[4] == "remote", error()
+                    assert line[location_index] == "remote", error()
 
             with By("I expect total number to match"):
                 assert total_backups == local_backups + remote_backups, error()