Skip to content

Commit 84ea40a

Browse files
committed
changefeedccl: disable per-table PTS by default
This change updates the default value of the per-table protected timestamp cluster setting to false. Changefeeds will continue to use the existing single-record format for protected timestamps, even when there are multiple tables. Fixes: #153900 Epic: CRDB-1421 Release note: None
1 parent 8f413be commit 84ea40a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pkg/ccl/changefeedccl/changefeedbase/settings.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ var ProtectTimestampBucketingInterval = settings.RegisterDurationSetting(
213213
settings.ApplicationLevel,
214214
"changefeed.protect_timestamp_bucketing_interval",
215215
"controls the amount a table is allowed to lag behind the most advanced table before a per-table protected timestamp record is created; "+
216-
"only used when changefeed.protected_timestamp.per_table.enabled is true",
216+
"only used when changefeed.protect_timestamp.per_table.enabled is true",
217217
2*time.Minute,
218218
settings.PositiveDuration)
219219

@@ -229,10 +229,10 @@ var ProtectTimestampLag = settings.RegisterDurationSetting(
229229
// instead of a single record for all tables in a changefeed.
230230
var PerTableProtectedTimestamps = settings.RegisterBoolSetting(
231231
settings.ApplicationLevel,
232-
"changefeed.protected_timestamp.per_table.enabled",
232+
"changefeed.protect_timestamp.per_table.enabled",
233233
"if true, creates separate protected timestamp records for each table in a changefeed; "+
234234
"if false, uses a single protected timestamp record for all tables",
235-
metamorphic.ConstantWithTestBool("changefeed.protected_timestamp.per_table.enabled", true))
235+
metamorphic.ConstantWithTestBool("changefeed.protect_timestamp.per_table.enabled", false))
236236

237237
// MaxProtectedTimestampAge controls the frequency of protected timestamp record updates
238238
var MaxProtectedTimestampAge = settings.RegisterDurationSetting(

pkg/cmd/roachtest/tests/cdc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1831,7 +1831,7 @@ func runCDCMultiTablePTSBenchmark(
18311831
numRanges = params.numRanges
18321832
}
18331833

1834-
if _, err := db.Exec("SET CLUSTER SETTING changefeed.protected_timestamp.per_table.enabled = $1", params.perTablePTS); err != nil {
1834+
if _, err := db.Exec("SET CLUSTER SETTING changefeed.protect_timestamp.per_table.enabled = $1", params.perTablePTS); err != nil {
18351835
t.Fatalf("failed to set per-table protected timestamps: %v", err)
18361836
}
18371837

@@ -3163,7 +3163,7 @@ func registerCDC(r registry.Registry) {
31633163
// when frontier persistence is on.
31643164
"changefeed.span_checkpoint.interval": "'0'",
31653165
// Disable per-table PTS to avoid impact on results.
3166-
"changefeed.protected_timestamp.per_table.enabled": "false",
3166+
"changefeed.protect_timestamp.per_table.enabled": "false",
31673167
} {
31683168
stmt := fmt.Sprintf(`SET CLUSTER SETTING %s = %s`, name, value)
31693169
if _, err := db.ExecContext(ctx, stmt); err != nil {

0 commit comments

Comments
 (0)