From 594da6db7a3c30ddea7b0d36d55f5b64271f7520 Mon Sep 17 00:00:00 2001 From: Slach Date: Thu, 28 Mar 2024 15:38:26 +0400 Subject: [PATCH] remove added `clickhouse-server:24.3` from CI/CD pipelines, wait when resolve https://github.com/ClickHouse/ClickHouse/issues/62018 --- .github/workflows/build.yaml | 6 ++++-- ChangeLog.md | 1 - pkg/backup/download.go | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 90630ccc..4e0ccffd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -121,7 +121,8 @@ jobs: - '22.8' - '23.3' - '23.8' - - '24.3' + # wait when resolve https://github.com/ClickHouse/ClickHouse/issues/62018 + # - '24.3' steps: - name: Setup golang id: setup-go @@ -235,7 +236,8 @@ jobs: - '22.8' - '23.3' - '23.8' - - '24.3' + # wait when resolve https://github.com/ClickHouse/ClickHouse/issues/62018 + # - '24.3' steps: - name: Checkout project uses: actions/checkout@v4 diff --git a/ChangeLog.md b/ChangeLog.md index e4f6a4c5..a138e15f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,6 @@ IMPROVEMENTS - added support of native Clickhouse incremental backup for `use_embedded_backup_restore: true` fix [735](https://github.com/Altinity/clickhouse-backup/issues/735) - added `GCS_CHUNK_SIZE` config parameter, try to speedup GCS upload fix [874](https://github.com/Altinity/clickhouse-backup/pull/874), thanks @dermasmid - switched to golang 1.22 -- added `clickhouse-server:24.3` to CI/CD pipelines BUG FIXES - continue `S3_MAX_PARTS_COUNT` default value from `2000` to `4000` to continue decrease memory usage for S3 diff --git a/pkg/backup/download.go b/pkg/backup/download.go index 80399a07..426f6258 100644 --- a/pkg/backup/download.go +++ b/pkg/backup/download.go @@ -525,6 +525,9 @@ func (b *Backuper) downloadTableMetadata(ctx context.Context, backupName string, // downloadMissedInnerTablesMetadata - download, missed .inner. tables if materialized view query not contains `TO db.table` clause, https://github.com/Altinity/clickhouse-backup/issues/765 // @todo think about parallel download if sequentially will slow func (b *Backuper) downloadMissedInnerTablesMetadata(ctx context.Context, backupName string, metadataSize uint64, tablesForDownload []metadata.TableTitle, tableMetadataAfterDownload []*metadata.TableMetadata, disks []clickhouse.Disk, schemaOnly bool, partitions []string, log *apexLog.Entry) ([]*metadata.TableMetadata, []metadata.TableTitle, uint64, error) { + if b.isEmbedded { + return tableMetadataAfterDownload, tablesForDownload, metadataSize, nil + } for _, t := range tableMetadataAfterDownload { if t == nil { continue