Merge cockroachdb#107391 cockroachdb#107659 cockroachdb#107697 cockroachdb#107721 cockroachdb#107728 cockroachdb#107750 cockroachdb#107753

107391: roachtest: include link to testeng grafana in issue posts r=smg260,tbg a=annrpom

This adds a link, populated with relevant cluster name and test timeframe, to the testeng grafana instance for failed roachtests.

Fixes: cockroachdb#105894
Release note: None

107659: serverutils: provide SQLConn/SQLConnE in ApplicationLayerInterface r=stevendanna a=knz

Fixes  cockroachdb#107672.
Part of solving cockroachdb#107058.
Informs cockroachdb#106772.

Epic: CRDB-18499



107697: rpc: avoid crash in newPeer r=erikgrinaker a=tbg

It was previously possible to make a new peer while the old one was in the
middle of being deleted, which caused a crash due to to acquiring child metrics
when they still existed.

Luckily, this is easy enough to fix: just remove some premature optimization
where I had tried to be too clever.

Fixes cockroachdb#105335.

Epic: CRDB-21710
Release note: None (bug never released)

107721: asim: skip TestAllocatorSimulatorDeterministic and example_fulldisk r=wenyihu6 a=wenyihu6

We found some non-deterministic behavior in the allocator simulator (see cockroachdb#105904
for more details). For now, we are skipping these potentially flaky tests.

Release Note: None 
Epic: None

107728: persistedsqlstats: specify background qos for compaction job r=xinhaoz a=xinhaoz

The compaction job can be an expensive operation so we should de-prioritize it with the `UserLow` qos setting.

Fixes: cockroachdb#99949

Release note: None

107750: ui: fix app = empty string filter on stmts page r=xinhaoz a=xinhaoz

The filter on app name = empty string was not working on
the stmts page. This was due to the fact that we use (unset)
as the option in the filter to represent selecting the empty
string app name. However when filtering statements, the empty
string app name on the stmt was not changed accordingly.
this commit fixes this and also adds testing for the unset case.

Epic: none
Fixes: cockroachdb#107748

Release note (bug fix): Filter on stmts page works for
app name = empty string (represented as 'unset').

https://www.loom.com/share/2fee4f0fb7b04208803e0dac1d9694ab?sid=5cabecf9-1c2a-406b-89a8-b378ed07d329



107753: backupccl: deflake TestBackupAndRestoreJobDescription r=stevendanna a=adityamaru

This change sorts the jobs based on when they
were created to ensure we get a stable sort of
job descriptions.

Fixes: cockroachdb#107684
Release note: None

Co-authored-by: Annie Pompa <[email protected]>
Co-authored-by: Raphael 'kena' Poss <[email protected]>
Co-authored-by: Tobias Grieger <[email protected]>
Co-authored-by: wenyihu6 <[email protected]>
Co-authored-by: Xin Hao Zhang <[email protected]>
Co-authored-by: adityamaru <[email protected]>

Author: 7 people

pkg/ccl/auditloggingccl/audit_logging_test.go

@@ -10,10 +10,8 @@ package auditloggingccl
 
 import (
 	"context"
-	gosql "database/sql"
 	"fmt"
 	"math"
-	"net/url"
 	"regexp"
 	"strings"
 	"testing"
@@ -121,13 +119,7 @@ func TestSingleRoleAuditLogging(t *testing.T) {
 	rootRunner := sqlutils.MakeSQLRunner(sqlDB)
 	defer s.Stopper().Stop(context.Background())
 
-	testUserURL, cleanupFn := sqlutils.PGUrl(t,
-		s.ApplicationLayer().AdvSQLAddr(), t.Name(), url.User(username.TestUser))
-	defer cleanupFn()
-
-	testUserDb, err := gosql.Open("postgres", testUserURL.String())
-	require.NoError(t, err)
-	defer testUserDb.Close()
+	testUserDb := s.ApplicationLayer().SQLConnForUser(t, username.TestUser, "")
 	testRunner := sqlutils.MakeSQLRunner(testUserDb)
 
 	// Dummy table/user used by tests.
@@ -250,16 +242,10 @@ func TestMultiRoleAuditLogging(t *testing.T) {
 	defer cleanup()
 
 	s, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{})
-	rootRunner := sqlutils.MakeSQLRunner(sqlDB)
 	defer s.Stopper().Stop(context.Background())
+	rootRunner := sqlutils.MakeSQLRunner(sqlDB)
 
-	testUserURL, cleanupFn := sqlutils.PGUrl(t,
-		s.ApplicationLayer().AdvSQLAddr(), t.Name(), url.User(username.TestUser))
-	defer cleanupFn()
-
-	testUserDb, err := gosql.Open("postgres", testUserURL.String())
-	require.NoError(t, err)
-	defer testUserDb.Close()
+	testUserDb := s.ApplicationLayer().SQLConnForUser(t, username.TestUser, "")
 	testRunner := sqlutils.MakeSQLRunner(testUserDb)
 
 	// Dummy table/user used by tests.
@@ -374,13 +360,7 @@ func TestReducedAuditConfig(t *testing.T) {
 		return nil
 	})
 
-	testUserURL, cleanupFn := sqlutils.PGUrl(t,
-		s.ApplicationLayer().AdvSQLAddr(), t.Name(), url.User(username.TestUser))
-	defer cleanupFn()
-
-	testUserDb, err := gosql.Open("postgres", testUserURL.String())
-	require.NoError(t, err)
-	defer testUserDb.Close()
+	testUserDb := s.ApplicationLayer().SQLConnForUser(t, username.TestUser, "")
 	testRunner := sqlutils.MakeSQLRunner(testUserDb)
 
 	// Set a cluster configuration.
@@ -436,9 +416,7 @@ func TestReducedAuditConfig(t *testing.T) {
 	}
 
 	// Open 2nd connection for the test user.
-	testUserDb2, err := gosql.Open("postgres", testUserURL.String())
-	require.NoError(t, err)
-	defer testUserDb2.Close()
+	testUserDb2 := s.ApplicationLayer().SQLConnForUser(t, username.TestUser, "")
 	testRunner2 := sqlutils.MakeSQLRunner(testUserDb2)
 
 	// Run a query on the new connection. The new connection will cause the reduced audit config to be re-computed.

pkg/ccl/backupccl/backup_test.go

@@ -897,7 +897,7 @@ func TestBackupAndRestoreJobDescription(t *testing.T) {
 	resolvedAsOfCollectionURIs := getResolvedCollectionURIs(collections, asOf1)
 
 	sqlDB.CheckQueryResults(
-		t, "SELECT description FROM [SHOW JOBS] WHERE job_type='RESTORE'",
+		t, "SELECT description FROM [SHOW JOBS] WHERE job_type='RESTORE' ORDER BY created",
 		[][]string{
 			{fmt.Sprintf("RESTORE DATABASE data FROM ('%s', '%s', '%s')",
 				backups[0].(string), backups[1].(string), backups[2].(string))},
@@ -1006,7 +1006,7 @@ func backupAndRestore(
 ) {
 	conn := tc.Conns[0]
 	sqlDB := sqlutils.MakeSQLRunner(conn)
-	storageConn := tc.StorageClusterConn()
+	storageConn := tc.SystemLayer(0).SQLConn(t, "")
 	storageSQLDB := sqlutils.MakeSQLRunner(storageConn)
 	storageSQLDB.Exec(t, "SET DATABASE=defaultdb")
 	{

pkg/ccl/backupccl/create_scheduled_backup_test.go

@@ -10,9 +10,7 @@ package backupccl
 
 import (
 	"context"
-	gosql "database/sql"
 	"fmt"
-	"net/url"
 	"regexp"
 	"sort"
 	"strconv"
@@ -970,18 +968,9 @@ func TestCreateBackupScheduleRequiresAdminRole(t *testing.T) {
 	defer cleanup()
 
 	th.sqlDB.Exec(t, `CREATE USER testuser`)
-	pgURL, cleanupFunc := sqlutils.PGUrl(
-		t, th.server.ApplicationLayer().AdvSQLAddr(),
-		"TestCreateSchedule-testuser", url.User("testuser"),
-	)
-	defer cleanupFunc()
-	testuser, err := gosql.Open("postgres", pgURL.String())
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, testuser.Close())
-	}()
+	testuser := th.server.ApplicationLayer().SQLConnForUser(t, "testuser", "")
 
-	_, err = testuser.Exec("CREATE SCHEDULE FOR BACKUP INTO 'somewhere' RECURRING '@daily'")
+	_, err := testuser.Exec("CREATE SCHEDULE FOR BACKUP INTO 'somewhere' RECURRING '@daily'")
 	require.Error(t, err)
 }
 

pkg/ccl/backupccl/show_test.go

@@ -10,7 +10,6 @@ package backupccl
 
 import (
 	"context"
-	gosql "database/sql"
 	"fmt"
 	"net/url"
 	"os"
@@ -681,14 +680,7 @@ func TestShowBackupPrivileges(t *testing.T) {
 	sqlDB.Exec(t, `CREATE USER testuser`)
 	sqlDB.Exec(t, `CREATE TABLE privs (a INT)`)
 
-	pgURL, cleanup := sqlutils.PGUrl(t, srv.ApplicationLayer().AdvSQLAddr(),
-		"TestShowBackupPrivileges-testuser", url.User("testuser"))
-	defer cleanup()
-	testuser, err := gosql.Open("postgres", pgURL.String())
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, testuser.Close())
-	}()
+	testuser := srv.ApplicationLayer().SQLConnForUser(t, "testuser", "")
 
 	// Make an initial backup.
 	const full = localFoo + "/full"
@@ -698,7 +690,7 @@ func TestShowBackupPrivileges(t *testing.T) {
 	// Make a second full backup using non into syntax.
 	sqlDB.Exec(t, `BACKUP TO $1;`, full)
 
-	_, err = testuser.Exec(`SHOW BACKUPS IN $1`, full)
+	_, err := testuser.Exec(`SHOW BACKUPS IN $1`, full)
 	require.True(t, testutils.IsError(err,
 		"only users with the admin role or the EXTERNALIOIMPLICITACCESS system privilege are allowed to access the specified nodelocal URI"))
 

pkg/ccl/backupccl/tenant_backup_nemesis_test.go

@@ -22,7 +22,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/security/username"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
-	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/util"
 	"github.com/cockroachdb/cockroach/pkg/util/ctxgroup"
@@ -81,8 +80,7 @@ func TestTenantBackupWithCanceledImport(t *testing.T) {
 		},
 	})
 	require.NoError(t, err)
-	tenant10Conn, err := serverutils.OpenDBConnE(tenant10.SQLAddr(), "defaultdb", false, tenant10.Stopper())
-	require.NoError(t, err)
+	tenant10Conn := tenant10.SQLConn(t, "defaultdb")
 	tenant10DB := sqlutils.MakeSQLRunner(tenant10Conn)
 
 	tenant10DB.Exec(t, "CREATE DATABASE bank")
@@ -110,8 +108,7 @@ func TestTenantBackupWithCanceledImport(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	tenant11Conn, err := serverutils.OpenDBConnE(tenant11.SQLAddr(), "bank", false, tenant11.Stopper())
-	require.NoError(t, err)
+	tenant11Conn := tenant11.SQLConn(t, "bank")
 	tenant11DB := sqlutils.MakeSQLRunner(tenant11Conn)
 	countQuery := fmt.Sprintf(`SELECT count(1) FROM bank."%s"`, tableName)
 	assertEqualQueries(t, tenant10DB, tenant11DB, countQuery)
@@ -157,9 +154,7 @@ func TestTenantBackupNemesis(t *testing.T) {
 		},
 	})
 	require.NoError(t, err)
-	tenant10Conn, err := serverutils.OpenDBConnE(
-		tenant10.SQLAddr(), "defaultdb", false, tenant10.Stopper())
-	require.NoError(t, err)
+	tenant10Conn := tenant10.SQLConn(t, "defaultdb")
 	_, err = tenant10Conn.Exec("CREATE DATABASE bank")
 	require.NoError(t, err)
 	_, err = tenant10Conn.Exec("USE bank")
@@ -184,7 +179,7 @@ func TestTenantBackupNemesis(t *testing.T) {
 	g := ctxgroup.WithContext(ctx)
 	g.GoCtx(func(ctx context.Context) error {
 		pgURL, cleanupGoDB, err := sqlutils.PGUrlE(
-			tenant10.SQLAddr(), "workload-worker" /* prefix */, url.User(username.RootUser))
+			tenant10.AdvSQLAddr(), "workload-worker" /* prefix */, url.User(username.RootUser))
 		if err != nil {
 			return err
 		}
@@ -259,9 +254,7 @@ func TestTenantBackupNemesis(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	tenant11Conn, err := serverutils.OpenDBConnE(
-		tenant11.SQLAddr(), "bank", false, tenant11.Stopper())
-	require.NoError(t, err)
+	tenant11Conn := tenant11.SQLConn(t, "bank")
 
 	tenant10SQLDB := sqlutils.MakeSQLRunner(tenant10Conn)
 	tenant11SQLDB := sqlutils.MakeSQLRunner(tenant11Conn)

pkg/ccl/cloudccl/cloudprivilege/privileges_test.go

@@ -10,9 +10,7 @@ package cloudprivilege
 
 import (
 	"context"
-	gosql "database/sql"
 	"fmt"
-	"net/url"
 	"testing"
 
 	"github.com/cockroachdb/cockroach/pkg/base"
@@ -44,14 +42,7 @@ func TestURIRequiresAdminOrPrivilege(t *testing.T) {
 	rootDB := sqlutils.MakeSQLRunner(conn)
 
 	rootDB.Exec(t, `CREATE USER testuser`)
-	pgURL, cleanupFunc := sqlutils.PGUrl(
-		t, tc.ApplicationLayer(0).AdvSQLAddr(), "TestURIRequiresAdminRole-testuser",
-		url.User("testuser"),
-	)
-	defer cleanupFunc()
-	testuser, err := gosql.Open("postgres", pgURL.String())
-	require.NoError(t, err)
-	defer testuser.Close()
+	testuser := tc.ApplicationLayer(0).SQLConnForUser(t, username.TestUser, "")
 	rootDB.Exec(t, `CREATE TABLE foo (id INT)`)
 
 	// Grant SELECT so that EXPORT fails when checking URI privileges.

pkg/ccl/kvccl/kvfollowerreadsccl/BUILD.bazel

@@ -62,7 +62,6 @@ go_test(
         "//pkg/rpc",
         "//pkg/security/securityassets",
         "//pkg/security/securitytest",
-        "//pkg/security/username",
         "//pkg/server",
         "//pkg/settings/cluster",
         "//pkg/sql",

pkg/ccl/kvccl/kvfollowerreadsccl/followerreads_test.go

@@ -13,7 +13,6 @@ import (
 	gosql "database/sql"
 	"fmt"
 	"math"
-	"net/url"
 	"strings"
 	"testing"
 	"time"
@@ -31,7 +30,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/rpc"
-	"github.com/cockroachdb/cockroach/pkg/security/username"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/sql"
 	"github.com/cockroachdb/cockroach/pkg/sql/physicalplan/replicaoracle"
@@ -971,23 +969,22 @@ func TestSecondaryTenantFollowerReadsRouting(t *testing.T) {
 		// in KV so we must ensure they're not redacted.
 		systemSQL.Exec(t, `SET CLUSTER SETTING server.secondary_tenants.redact_trace.enabled = 'false'`)
 
+		dbs := make([]*gosql.DB, numNodes)
+		for i := 0; i < numNodes; i++ {
+			dbs[i] = tenants[i].SQLConn(t, "")
+		}
+
 		// Wait until all tenant servers are aware of the setting override.
 		testutils.SucceedsSoon(t, func() error {
 			settingNames := []string{
 				"kv.closed_timestamp.target_duration", "kv.closed_timestamp.side_transport_interval", "kv.closed_timestamp.propagation_slack",
 			}
 			for _, settingName := range settingNames {
 				for i := 0; i < numNodes; i++ {
-					pgURL, cleanup := sqlutils.PGUrl(t, tenants[i].SQLAddr(), "Tenant", url.User(username.RootUser))
-					defer cleanup()
-					db, err := gosql.Open("postgres", pgURL.String())
-					if err != nil {
-						t.Fatal(err)
-					}
-					defer db.Close()
+					db := dbs[i]
 
 					var val string
-					err = db.QueryRow(
+					err := db.QueryRow(
 						fmt.Sprintf("SHOW CLUSTER SETTING %s", settingName),
 					).Scan(&val)
 					require.NoError(t, err)
@@ -1003,13 +1000,7 @@ func TestSecondaryTenantFollowerReadsRouting(t *testing.T) {
 			return nil
 		})
 
-		pgURL, cleanupPGUrl := sqlutils.PGUrl(
-			t, tenants[3].SQLAddr(), "Tenant", url.User(username.RootUser),
-		)
-		defer cleanupPGUrl()
-		tenantSQLDB, err := gosql.Open("postgres", pgURL.String())
-		require.NoError(t, err)
-		defer tenantSQLDB.Close()
+		tenantSQLDB := dbs[3]
 		tenantSQL := sqlutils.MakeSQLRunner(tenantSQLDB)
 
 		tenantSQL.Exec(t, `CREATE DATABASE t`)

pkg/ccl/kvccl/kvtenantccl/upgradeccl/BUILD.bazel

@@ -16,7 +16,6 @@ go_test(
         "//pkg/roachpb",
         "//pkg/security/securityassets",
         "//pkg/security/securitytest",
-        "//pkg/security/username",
         "//pkg/server",
         "//pkg/settings/cluster",
         "//pkg/spanconfig",