Merge #154339 #154340 #154394

154339: backup: deflake TestFullClusterRestoreWithUserIDs r=kev-cao a=msbutler

Fixes #154006

Release note: none

154340: external connection: pass name as parameter r=kev-cao a=msbutler

Epic: none

Release note: none

154394: roachtest: set positive workload seed in or recovery test r=kev-cao a=msbutler

Informs #154345

Release note: none

Co-authored-by: Michael Butler <[email protected]>

Author: craig[bot]

pkg/backup/full_cluster_backup_restore_test.go

@@ -1189,29 +1189,29 @@ func TestFullClusterRestoreWithUserIDs(t *testing.T) {
 	sqlDB.Exec(t, `CREATE USER test2`)
 	sqlDB.Exec(t, `BACKUP INTO $1`, localFoo)
 
-	sqlDB.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id FROM system.users ORDER BY user_id`, [][]string{
-		{"root", "", "false", "1"},
-		{"admin", "", "true", "2"},
-		{"test1", "NULL", "false", "100"},
-		{"test2", "NULL", "false", "101"},
+	sqlDB.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole" FROM system.users ORDER BY user_id`, [][]string{
+		{"root", "", "false"},
+		{"admin", "", "true"},
+		{"test1", "NULL", "false"},
+		{"test2", "NULL", "false"},
 	})
 	// Ensure that the new backup succeeds.
 	sqlDBRestore.Exec(t, `RESTORE FROM LATEST IN $1`, localFoo)
 
-	sqlDBRestore.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id FROM system.users ORDER BY user_id`, [][]string{
-		{"root", "", "false", "1"},
-		{"admin", "", "true", "2"},
-		{"test1", "NULL", "false", "100"},
-		{"test2", "NULL", "false", "101"},
+	sqlDBRestore.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole" FROM system.users ORDER BY user_id`, [][]string{
+		{"root", "", "false"},
+		{"admin", "", "true"},
+		{"test1", "NULL", "false"},
+		{"test2", "NULL", "false"},
 	})
 
 	sqlDBRestore.Exec(t, `CREATE USER test3`)
 
-	sqlDBRestore.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id FROM system.users ORDER BY user_id`, [][]string{
-		{"root", "", "false", "1"},
-		{"admin", "", "true", "2"},
-		{"test1", "NULL", "false", "100"},
-		{"test2", "NULL", "false", "101"},
-		{"test3", "NULL", "false", "102"},
+	sqlDBRestore.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole" FROM system.users ORDER BY user_id`, [][]string{
+		{"root", "", "false"},
+		{"admin", "", "true"},
+		{"test1", "NULL", "false"},
+		{"test2", "NULL", "false"},
+		{"test3", "NULL", "false"},
 	})
 }

pkg/cloud/externalconn/record.go

@@ -94,7 +94,7 @@ func LoadExternalConnection(
 	// `SELECT` on the system table.
 	row, cols, err := txn.QueryRowExWithCols(ctx, "lookup-schedule", txn.KV(),
 		sessiondata.NodeUserSessionDataOverride,
-		fmt.Sprintf("SELECT * FROM system.external_connections WHERE connection_name = '%s'", name))
+		"SELECT * FROM system.external_connections WHERE connection_name = $1", name)
 
 	if err != nil {
 		return nil, errors.CombineErrors(err, &ExternalConnectionNotFoundError{connectionName: name})

pkg/cmd/roachtest/tests/backup_restore_roundtrip.go

@@ -448,6 +448,7 @@ func createDriversForBackupRestore(
 
 func testOnlineRestoreRecovery(ctx context.Context, t test.Test, c cluster.Cluster) {
 	testRNG, seed := randutil.NewLockedPseudoRand()
+	workloadSeed := testRNG.Int63()
 	t.L().Printf("random seed: %d", seed)
 
 	c.Start(ctx, t.L(), roachtestutil.MaybeUseMemoryBudget(t, 50), install.MakeClusterSettings(), c.CRDBNodes())
@@ -466,7 +467,7 @@ func testOnlineRestoreRecovery(ctx context.Context, t test.Test, c cluster.Clust
 
 		dbs := []string{"bank", "tpcc", schemaChangeDB}
 		d, runBackgroundWorkload, _, err := createDriversForBackupRestore(
-			ctx, t, c, m, testRNG, seed, testUtils, dbs,
+			ctx, t, c, m, testRNG, workloadSeed, testUtils, dbs,
 		)
 		if err != nil {
 			return err