fix TestRestoreRBAC and improve clickhouse-go connection pool setti…

…ngs to allow properly SYSTEM SHUTDOWN + need_rebuild_list.mark behavior for 20.4-22.3 versions
Altinity · Jan 24, 2024 · a037207 · a037207
1 parent 3661ce9
commit a037207
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/clickhouse/clickhouse.go b/pkg/clickhouse/clickhouse.go
@@ -61,8 +61,8 @@ func (ch *ClickHouse) Connect() error {
 			"send_timeout":    int(timeout.Seconds()),
 		},
 		MaxOpenConns:    ch.Config.MaxConnections,
-		ConnMaxLifetime: timeout,
-		MaxIdleConns:    0,
+		ConnMaxLifetime: 0, // don't change it, it related to SYSTEM SHUTDOWN behavior for properly rebuild RBAC lists on 20.4-22.3
+		MaxIdleConns:    1,
 		DialTimeout:     timeout,
 		ReadTimeout:     timeout,
 	}

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -534,6 +534,7 @@ func DefaultConfig() *Config {
 			BackupMutations:                  true,
 			RestoreAsAttach:                  false,
 			CheckPartsColumns:                true,
+			MaxConnections:                   int(downloadConcurrency),
 		},
 		AzureBlob: AzureBlobConfig{
 			EndpointSchema:    "https",