Merge cockroachdb#91840 cockroachdb#91857

91840: server: remove unused apiv2 server field r=knz a=dhartunian Epic: None Resolves: cockroachdb#91829 Release note: None 91857: skip flaky tests r=andrewbaptist a=knz Informs cockroachdb#91856 Informs cockroachdb#91858 Co-authored-by: David Hartunian <[email protected]> Co-authored-by: Raphael 'kena' Poss <[email protected]>
stevendanna · Nov 14, 2022 · bc06ae6 · bc06ae6
3 parents 3f00311 + 460fea4 + a9dc45b
commit bc06ae6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/pkg/kv/kvclient/kvcoord/dist_sender_server_test.go b/pkg/kv/kvclient/kvcoord/dist_sender_server_test.go
@@ -36,6 +36,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/kvclientutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -1079,6 +1080,9 @@ func TestMultiRangeScanReverseScanDeleteResolve(t *testing.T) {
 // using the clock local to the distributed sender.
 func TestMultiRangeScanReverseScanInconsistent(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+
+	skip.WithIssue(t, 91856) // flaky test
+
 	defer log.Scope(t).Close(t)
 
 	for _, rc := range []roachpb.ReadConsistencyType{

diff --git a/pkg/server/api_v2.go b/pkg/server/api_v2.go
@@ -44,7 +44,6 @@ import (
 	"strconv"
 
 	"github.com/cockroachdb/cockroach/pkg/kv"
-	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/security/username"
 	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
 	"github.com/cockroachdb/cockroach/pkg/server/telemetry"
@@ -82,7 +81,6 @@ type apiV2ServerOpts struct {
 	admin            *adminServer
 	status           *statusServer
 	promRuleExporter *metric.PrometheusRuleExporter
-	tenantID         roachpb.TenantID
 	sqlServer        *SQLServer
 	db               *kv.DB
 }
@@ -100,7 +98,6 @@ type apiV2Server struct {
 	status           *statusServer
 	promRuleExporter *metric.PrometheusRuleExporter
 	mux              *mux.Router
-	tenantID         roachpb.TenantID
 	sqlServer        *SQLServer
 	db               *kv.DB
 }

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -1663,7 +1663,6 @@ func (s *Server) PreStart(ctx context.Context) error {
 			admin:            s.admin,
 			status:           s.status,
 			promRuleExporter: s.promRuleExporter,
-			tenantID:         roachpb.SystemTenantID,
 			sqlServer:        s.sqlServer,
 			db:               s.db,
 		}), /* apiServer */

diff --git a/pkg/server/tenant.go b/pkg/server/tenant.go
@@ -572,7 +572,6 @@ func (s *SQLServerWrapper) PreStart(ctx context.Context) error {
 		s.debug,           /* handleDebugUnauthenticated */
 		newAPIV2Server(workersCtx, &apiV2ServerOpts{
 			sqlServer: s.sqlServer,
-			tenantID:  s.sqlCfg.TenantID,
 			db:        s.db,
 		}), /* apiServer */
 	); err != nil {

diff --git a/pkg/sql/sem/builtins/builtins_test.go b/pkg/sql/sem/builtins/builtins_test.go
@@ -99,6 +99,9 @@ func TestMapToUniqueUnorderedID(t *testing.T) {
 func TestSerialNormalizationWithUniqueUnorderedID(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	ctx := context.Background()
+
+	skip.WithIssue(t, 91858) // flaky test
+
 	skip.UnderRace(t, "the test is too slow and the goodness of fit test "+
 		"assumes large N")
 	params := base.TestServerArgs{}