Skip to content

Commit

Permalink
changefeedccl: re-enable diagram storage
Browse files Browse the repository at this point in the history
Now that these are capped by cockroachdb#126084 it is safe to capture new ones unconditionally.

Release note: none.
Epic: none.
  • Loading branch information
dt committed Jun 26, 2024
1 parent c5522ce commit 7b62ac4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
4 changes: 1 addition & 3 deletions pkg/ccl/changefeedccl/changefeed_dist.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,7 @@ func startDistChangefeed(
finishedSetupFn = func(flowinfra.Flow) { resultsCh <- tree.Datums(nil) }
}

if log.V(1) {
jobsprofiler.StorePlanDiagram(ctx, execCfg.DistSQLSrv.Stopper, p, execCfg.InternalDB, jobID)
}
jobsprofiler.StorePlanDiagram(ctx, execCfg.DistSQLSrv.Stopper, p, execCfg.InternalDB, jobID)

// Make sure to use special changefeed monitor going forward as the
// parent monitor for the DistSQL infrastructure. This is needed to
Expand Down
13 changes: 5 additions & 8 deletions pkg/jobs/jobsprofiler/profiler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,11 @@ func TestProfilerStorePlanDiagram(t *testing.T) {
sql: "RESTORE TABLE foo FROM LATEST IN 'userfile:///foo' WITH into_db='test'",
typ: jobspb.TypeRestore,
},
/*
TODO(dt): re-enable this once #126083 is fixed.
{
name: "changefeed",
sql: "CREATE CHANGEFEED FOR foo INTO 'null://sink'",
typ: jobspb.TypeChangefeed,
},
*/
{
name: "changefeed",
sql: "CREATE CHANGEFEED FOR foo INTO 'null://sink'",
typ: jobspb.TypeChangefeed,
},
} {
t.Run(tc.name, func(t *testing.T) {
_, err := sqlDB.Exec(tc.sql)
Expand Down

0 comments on commit 7b62ac4

Please sign in to comment.