fix log_pointer handle from system.replicas during restore, fix #967

Altinity · Oct 22, 2024 · 5ff4648 · 5ff4648
1 parent 6640289
commit 5ff4648
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -9,6 +9,7 @@ IMPROVEMENTS
 
 BUG FIXES
 - fix `TestLongListRemote` for properly time measurement
+- fix log_pointer handle from system.replicas during restore, fix [967](https://github.com/Altinity/clickhouse-backup/issues/967)
 
 # v2.6.2
 BUG FIXES

diff --git a/pkg/clickhouse/clickhouse.go b/pkg/clickhouse/clickhouse.go
@@ -1234,7 +1234,8 @@ func (ch *ClickHouse) CheckReplicationInProgress(table metadata.TableMetadata) (
 		if len(existsReplicas) > 1 {
 			return false, fmt.Errorf("invalid result for check exists replicas: %+v", existsReplicas)
 		}
-		if existsReplicas[0].LogPointer > 1 || existsReplicas[0].LogMaxIndex > 1 || existsReplicas[0].AbsoluteDelay > 0 || existsReplicas[0].QueueSize > 0 {
+		// https://github.com/Altinity/clickhouse-backup/issues/967
+		if existsReplicas[0].LogPointer > 2 || existsReplicas[0].LogMaxIndex > 1 || existsReplicas[0].AbsoluteDelay > 0 || existsReplicas[0].QueueSize > 0 {
 			return false, fmt.Errorf("%s.%s can't restore cause system.replicas entries already exists and replication in progress from another replica, log_pointer=%d, log_max_index=%d, absolute_delay=%d, queue_size=%d", table.Database, table.Table, existsReplicas[0].LogPointer, existsReplicas[0].LogMaxIndex, existsReplicas[0].AbsoluteDelay, existsReplicas[0].QueueSize)
 		} else {
 			log.Info().Msgf("replication_in_progress status = %+v", existsReplicas)