From 7b62ac484d6feb5bcf2c8e87630095ae244bd367 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 26 Jun 2024 19:07:07 +0000 Subject: [PATCH] changefeedccl: re-enable diagram storage Now that these are capped by #126084 it is safe to capture new ones unconditionally. Release note: none. Epic: none. --- pkg/ccl/changefeedccl/changefeed_dist.go | 4 +--- pkg/jobs/jobsprofiler/profiler_test.go | 13 +++++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pkg/ccl/changefeedccl/changefeed_dist.go b/pkg/ccl/changefeedccl/changefeed_dist.go index b87f34b97741..8ec05e054c65 100644 --- a/pkg/ccl/changefeedccl/changefeed_dist.go +++ b/pkg/ccl/changefeedccl/changefeed_dist.go @@ -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 diff --git a/pkg/jobs/jobsprofiler/profiler_test.go b/pkg/jobs/jobsprofiler/profiler_test.go index b99754359b36..0cf467d5486e 100644 --- a/pkg/jobs/jobsprofiler/profiler_test.go +++ b/pkg/jobs/jobsprofiler/profiler_test.go @@ -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)