Merge #154443 #154492 #154531

154443: cli: remove duplicate `stmt` column from `node_distsql_flows` r=dhartunian a=dhartunian

Resolves: #154442
Release note: None

154492: stmtdiagnostics: fix bizarre flake in TestDiagnosticsRequest r=yuzefovich a=yuzefovich

We just saw a failure in `TestDiagnosticsRequest` where "RESET statement_timeout;" itself timed out. Prevent such a flake by wrapping with SucceedsSoon.

Fixes: #154490.
Release note: None

154531: restore: fix restore hanging on server stop r=msbutler a=kev-cao

`RunTaskAsyncEx` returns an error if it is ran while the stopper is [stopping or
quiescing](https://github.com/cockroachdb/cockroach/blob/52aaf2e7ea3f20aced87d1dcc87a1873fb87ffbe/pkg/util/stop/stopper.go#L498-L500). In the generative split and scatterer processor, in the event that the task is run during stopping/quiesce, the `doneScatterCh` is never closed. That means that any follow up `Next` calls on the processor will hang on receiving from the channel.

Fixes: #153806

Release note: None

Co-authored-by: David Hartunian <[email protected]>
Co-authored-by: Yahor Yuzefovich <[email protected]>
Co-authored-by: Kevin Cao <[email protected]>

Author: 4 people

pkg/backup/generative_split_and_scatter_processor.go

@@ -367,6 +367,7 @@ func (gssp *generativeSplitAndScatterProcessor) Start(ctx context.Context) {
 	}); err != nil {
 		gssp.scatterErr = err
 		cancel()
+		close(gssp.doneScatterCh)
 		close(workerDone)
 	}
 }

pkg/cli/zip_table_registry.go

@@ -854,7 +854,6 @@ var zipInternalTablesPerNode = DebugZipTableRegistry{
 		nonSensitiveCols: NonSensitiveColumns{
 			"flow_id",
 			"node_id",
-			"stmt",
 			"since",
 			"crdb_internal.hide_sql_constants(stmt) as stmt",
 		},

pkg/sql/stmtdiagnostics/statement_diagnostics_test.go

@@ -173,8 +173,12 @@ func TestDiagnosticsRequest(t *testing.T) {
 		require.True(t, strings.Contains(err.Error(), sqlerrors.QueryTimeoutError.Error()))
 
 		// Reset the stmt timeout so that it doesn't affect the query in
-		// checkCompleted.
-		runner.Exec(t, "RESET statement_timeout;")
+		// checkCompleted. Wrap it in a SucceedsSoon in case RESET query itself
+		// times out.
+		testutils.SucceedsSoon(t, func() error {
+			_, err = db.Exec("RESET statement_timeout;")
+			return err
+		})
 		checkCompleted(reqID)
 	})