testcluster: remove StorageClusterConn

This is replaced by `.SystemLayer(0).SQLConn()`.

Release note: None

Author: knz

pkg/ccl/backupccl/backup_test.go

@@ -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/sql/logictest/logic.go

@@ -1565,7 +1565,7 @@ func (t *logicTest) newCluster(
 	// behavior.
 	if cfg.UseSecondaryTenant == logictestbase.Always || t.cluster.StartedDefaultTestTenant() {
 
-		conn := t.cluster.StorageClusterConn()
+		conn := t.cluster.SystemLayer(0).SQLConn(t.rootT, "")
 		clusterSettings := toa.clusterSettings
 		_, ok := clusterSettings[sql.SecondaryTenantZoneConfigsEnabled.Key()]
 		if ok {

pkg/testutils/serverutils/test_cluster_shim.go

@@ -233,12 +233,6 @@ type TestClusterInterface interface {
 	// cluster.
 	StorageLayer(idx int) StorageLayerInterface
 
-	// StorageClusterConn returns a gosql.DB connection to the first server in a
-	// storage cluster. This is useful in environments where it's not clear
-	// whether ServerConn is returning a connection to the storage cluster or a
-	// secondary tenant.
-	StorageClusterConn() *gosql.DB
-
 	// SplitTable splits a range in the table, creates a replica for the right
 	// side of the split on TargetNodeIdx, and moves the lease for the right
 	// side of the split to TargetNodeIdx for each SplitPoint. This forces the

pkg/testutils/testcluster/testcluster.go

@@ -65,13 +65,8 @@ type TestCluster struct {
 	// ReusableListeners is populated if (and only if) TestClusterArgs.ReusableListeners is set.
 	ReusableListeners map[int] /* idx */ *listenerutil.ReusableListener
 
-	// Connection to the storage cluster. Typically, the first connection in
-	// Conns, but could be different if we're transparently running in a test
-	// tenant (see the DefaultTestTenant flag of base.TestServerArgs for more
-	// detail).
-	storageConn *gosql.DB
-	stopper     *stop.Stopper
-	mu          struct {
+	stopper *stop.Stopper
+	mu      struct {
 		syncutil.Mutex
 		serverStoppers []*stop.Stopper
 	}
@@ -112,11 +107,6 @@ func (tc *TestCluster) ServerConn(idx int) *gosql.DB {
 	return tc.Conns[idx]
 }
 
-// StorageClusterConn is part of TestClusterInterface.
-func (tc *TestCluster) StorageClusterConn() *gosql.DB {
-	return tc.storageConn
-}
-
 // Stopper returns the stopper for this testcluster.
 func (tc *TestCluster) Stopper() *stop.Stopper {
 	return tc.stopper
@@ -626,22 +616,9 @@ func (tc *TestCluster) startServer(idx int, serverArgs base.TestServerArgs) erro
 		return err
 	}
 
-	// For the first server started, populate the storage cluster
-	// connection.
-	var storageDbConn *gosql.DB
-	if idx == 0 {
-		storageDbConn, err = server.SystemLayer().SQLConnE("")
-		if err != nil {
-			return err
-		}
-	}
-
 	tc.mu.Lock()
 	defer tc.mu.Unlock()
 	tc.Conns = append(tc.Conns, dbConn)
-	if idx == 0 {
-		tc.storageConn = storageDbConn
-	}
 	return nil
 }