allow_s3_native_copy

Altinity · Jun 11, 2024 · 89eae2f · 89eae2f
1 parent a6042fa
commit 89eae2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pkg/backup/backuper.go b/pkg/backup/backuper.go
@@ -183,12 +183,8 @@ func (b *Backuper) isDiskTypeEncryptedObject(disk clickhouse.Disk, disks []click
 
 func (b *Backuper) getEmbeddedBackupDefaultSettings(version int) []string {
 	settings := []string{}
-	if b.cfg.General.RemoteStorage == "s3" || b.cfg.General.RemoteStorage == "gcs" {
-		if version > 23007001 {
-			settings = append(settings, "allow_s3_native_copy=1")
-		} else {
-			settings = append(settings, "native_copy=1")
-		}
+	if (b.cfg.General.RemoteStorage == "s3" || b.cfg.General.RemoteStorage == "gcs") && version > 23007001 {
+		settings = append(settings, "allow_s3_native_copy=1")
 	}
 	if b.cfg.General.RemoteStorage == "azblob" && version >= 24005001 {
 		settings = append(settings, "allow_azure_native_copy=1")

diff --git a/test/integration/dynamic_settings.sh b/test/integration/dynamic_settings.sh
@@ -342,6 +342,7 @@ cat <<EOT > /etc/clickhouse-server/config.d/storage_configuration_azblob.xml
         <account_name>devstoreaccount1</account_name>
         <account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
         <cache_enabled>false</cache_enabled>
+        <use_native_copy>true</use_native_copy>
       </disk_azblob>
       <backups_azure>
         <type>azure_blob_storage</type>
@@ -351,6 +352,7 @@ cat <<EOT > /etc/clickhouse-server/config.d/storage_configuration_azblob.xml
         <account_name>devstoreaccount1</account_name>
         <account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
         <cache_enabled>false</cache_enabled>
+        <use_native_copy>true</use_native_copy>
       </backups_azure>
     </disks>
     <policies>