changefeedccl: prevent panic in per-table PTS mixed-version

aerfrei · aerfrei · commit e3fc03355bb8 · 2025-10-06T14:37:41.000Z
Fixes a panic that occurred when evaluating per-table protected timestamp settings. The fix adds a nil check on the change aggregator spec ProgressConfig before accessing the per-table PTS flag. Fixes: #154830 Epic: CRDB-1421 Release note: None
diff --git a/pkg/ccl/changefeedccl/changefeed_processors.go b/pkg/ccl/changefeedccl/changefeed_processors.go
@@ -1974,7 +1974,7 @@ func (cf *changeFrontier) manageProtectedTimestamps(
 		return cf.frontier.Frontier()
 	}()
 
-	if cf.spec.ProgressConfig.PerTableProtectedTimestamps {
+	if cf.spec.ProgressConfig != nil && cf.spec.ProgressConfig.PerTableProtectedTimestamps {
 		return cf.managePerTableProtectedTimestamps(ctx, txn, &ptsEntries, highwater)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1974,7 +1974,7 @@ func (cf *changeFrontier) manageProtectedTimestamps(`
`1974`	`1974`	`return cf.frontier.Frontier()`
`1975`	`1975`	`}()`
`1976`	`1976`
`1977`		`- if cf.spec.ProgressConfig.PerTableProtectedTimestamps {`
	`1977`	`+ if cf.spec.ProgressConfig != nil && cf.spec.ProgressConfig.PerTableProtectedTimestamps {`
`1978`	`1978`	`return cf.managePerTableProtectedTimestamps(ctx, txn, &ptsEntries, highwater)`
`1979`	`1979`	`}`
`1980`	`1980`