add 24.8 into CI/CD, add some fixes related with .inner. and .inner.i…

…d table for embedded backup restore, ClickHouse/ClickHouse#67669
Altinity · Aug 26, 2024 · 4d83171 · 4d83171
1 parent ae36a60
commit 4d83171
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/pkg/backup/create.go b/pkg/backup/create.go
@@ -136,6 +136,7 @@ func (b *Backuper) CreateBackup(backupName, diffFromRemote, tablePattern string,
 		err = b.createBackupLocal(ctx, backupName, diffFromRemote, doBackupData, schemaOnly, rbacOnly, configsOnly, backupVersion, partitionsIdMap, tables, tablePattern, disks, diskMap, diskTypes, allDatabases, allFunctions, backupRBACSize, backupConfigSize, startBackup, version)
 	}
 	if err != nil {
+		log.Error().Msgf("backup failed error: %v", err)
 		// delete local backup if can't create
 		if removeBackupErr := b.RemoveBackupLocal(ctx, backupName, disks); removeBackupErr != nil {
 			log.Error().Msgf("creating failed -> b.RemoveBackupLocal error: %v", removeBackupErr)
@@ -482,6 +483,12 @@ func (b *Backuper) generateEmbeddedBackupSQL(ctx context.Context, backupName str
 		if table.Skip {
 			continue
 		}
+
+		if version > 24004000 && (strings.HasPrefix(table.Name, ".inner.") || strings.HasPrefix(table.Name, ".inner_id.")) {
+			log.Warn().Msgf("`%s`.`%s` skipped, 24.4+ version contain bug for EMBEDDED BACKUP/RESTORE for `.inner.` and `.inner_id.` look details in https://github.com/ClickHouse/ClickHouse/issues/67669", table.Database, table.Name)
+			tablesListLen -= 1
+			continue
+		}
 		tablesTitle[i] = metadata.TableTitle{
 			Database: table.Database,
 			Table:    table.Name,

diff --git a/test/integration/integration_test.go b/test/integration/integration_test.go
@@ -111,8 +111,8 @@ type TestEnvironment struct {
 var defaultTestData = []TestDataStruct{
 	{
 		Database: dbNameOrdinary, DatabaseEngine: "Ordinary",
-		// 24.8 shall resolve https://github.com/ClickHouse/ClickHouse/issues/67669
-		Name:   ".inner.table1",
+		// .inner. shall resolve in https://github.com/ClickHouse/ClickHouse/issues/67669
+		Name:   ".inner_table1",
 		Schema: "(Date Date, TimeStamp DateTime, Logger String) ENGINE = MergeTree(Date, (TimeStamp, Logger), 8192)",
 		Rows: []map[string]interface{}{
 			{"Date": toDate("2018-10-23"), "TimeStamp": toTS("2018-10-23 07:37:14"), "Logger": "One"},
@@ -359,8 +359,8 @@ var defaultTestData = []TestDataStruct{
 var defaultIncrementData = []TestDataStruct{
 	{
 		Database: dbNameOrdinary, DatabaseEngine: "Ordinary",
-		// 24.8 shall resolve https://github.com/ClickHouse/ClickHouse/issues/67669
-		Name:   ".inner.table1",
+		// .inner. shall resolve in https://github.com/ClickHouse/ClickHouse/issues/67669
+		Name:   ".inner_table1",
 		Schema: "(Date Date, TimeStamp DateTime, Logger String) ENGINE = MergeTree(Date, (TimeStamp, Logger), 8192)",
 		Rows: []map[string]interface{}{
 			{"Date": toDate("2019-10-26"), "TimeStamp": toTS("2019-01-26 07:37:19"), "Logger": "Seven"},

diff --git a/test/integration/run.sh b/test/integration/run.sh
@@ -8,7 +8,7 @@ rm -rf "${CUR_DIR}/_coverage_/*"
 
 source "${CUR_DIR}/.env"
 
-export CLICKHOUSE_VERSION=${CLICKHOUSE_VERSION:-24.3}
+export CLICKHOUSE_VERSION=${CLICKHOUSE_VERSION:-24.8}
 if [[ "${CLICKHOUSE_VERSION}" =~ ^2[1-9]+ || "${CLICKHOUSE_VERSION}" == "head" ]]; then
   export CLICKHOUSE_IMAGE=${CLICKHOUSE_IMAGE:-clickhouse/clickhouse-server}
 else
@@ -104,4 +104,4 @@ if [[ "1" == "${CLEAN_AFTER:-0}" || "0" == "${TEST_FAILED}" ]]; then
         exit 1  # Exit with an error code if any command fails
     fi
   done
-fi
+fi
diff --git a/test/testflows/run.sh b/test/testflows/run.sh
@@ -2,7 +2,7 @@ CUR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 mkdir -p "${CUR_DIR}/_coverage_/"
 rm -rf "${CUR_DIR}/_coverage_/*"
 source "${CUR_DIR}/.env"
-export CLICKHOUSE_VERSION=${CLICKHOUSE_VERSION:-24.3}
+export CLICKHOUSE_VERSION=${CLICKHOUSE_VERSION:-24.8}
 if [[ "${CLICKHOUSE_VERSION}" =~ ^2[1-9]+ || "${CLICKHOUSE_VERSION}" == "head" ]]; then
   export CLICKHOUSE_IMAGE=${CLICKHOUSE_IMAGE:-clickhouse/clickhouse-server}
 else