Skip to content

Commit c922210

Browse files
shubhamdhamashubhamdhama
committed
sql: enable tenant testing for zone_test.go
This change is in a separate PR because updating `TestValidSetShowZones` to use `createTestServerParamsAllowTenants` instead of `createTestServerParams` required some investigation. It turned out simpler than expected. Zone settings for meta ranges aren't supported for secondary tenants, so this change simply exclude them from setup and validating. Informs: cockroachdb#140446 Epic: CRDB-38970 Release note: None
1 parent 36bf99d commit c922210

File tree

2 files changed

+51
-29
lines changed

2 files changed

+51
-29
lines changed

‎pkg/ccl/partitionccl/zone_test.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ func TestValidIndexPartitionSetShowZones(t *testing.T) {
5050
defer leaktest.AfterTest(t)()
5151
defer log.Scope(t).Close(t)
5252

53-
s, db, _ := serverutils.StartServer(t, base.TestServerArgs{
54-
DefaultTestTenant: base.TODOTestTenantDisabled,
55-
})
53+
s, db, _ := serverutils.StartServer(t, base.TestServerArgs{})
5654
defer s.Stopper().Stop(context.Background())
5755

5856
sqlDB := sqlutils.MakeSQLRunner(db)
@@ -253,9 +251,7 @@ func TestInvalidIndexPartitionSetShowZones(t *testing.T) {
253251
defer leaktest.AfterTest(t)()
254252
defer log.Scope(t).Close(t)
255253

256-
s, db, _ := serverutils.StartServer(t, base.TestServerArgs{
257-
DefaultTestTenant: base.TODOTestTenantDisabled,
258-
})
254+
s, db, _ := serverutils.StartServer(t, base.TestServerArgs{})
259255
defer s.Stopper().Stop(context.Background())
260256

261257
for i, tc := range []struct {

‎pkg/sql/zone_test.go

+49-23
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestValidSetShowZones(t *testing.T) {
2626
defer leaktest.AfterTest(t)()
2727
defer log.Scope(t).Close(t)
2828

29-
params, _ := createTestServerParams()
29+
params, _ := createTestServerParamsAllowTenants()
3030
s, db, _ := serverutils.StartServer(t, params)
3131
defer s.Stopper().Stop(context.Background())
3232

@@ -95,6 +95,8 @@ func TestValidSetShowZones(t *testing.T) {
9595
Config: partialZoneOverride,
9696
}
9797

98+
includeMetaRange := !s.StartedDefaultTestTenant()
99+
98100
// Remove stock zone configs installed at cluster bootstrap. Otherwise this
99101
// test breaks whenever these stock zone configs are adjusted.
100102
sqlutils.RemoveAllZoneConfigs(t, sqlDB)
@@ -112,7 +114,9 @@ func TestValidSetShowZones(t *testing.T) {
112114
// no other zones.
113115
sqlutils.SetZoneConfig(t, sqlDB, "DATABASE d", gcOverride)
114116
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultRow, partialDbRow)
115-
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", defaultRow)
117+
if includeMetaRange {
118+
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", defaultRow)
119+
}
116120
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE system", defaultRow)
117121
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE system.lease", defaultRow)
118122
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE d", dbRow)
@@ -121,26 +125,34 @@ func TestValidSetShowZones(t *testing.T) {
121125
// Ensure a table zone config applies to that table and no others.
122126
sqlutils.SetZoneConfig(t, sqlDB, "TABLE d.t", gcOverride)
123127
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultRow, partialDbRow, partialTableRow)
124-
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", defaultRow)
128+
if includeMetaRange {
129+
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", defaultRow)
130+
}
125131
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE system", defaultRow)
126132
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE system.lease", defaultRow)
127133
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE d", dbRow)
128134
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE d.t", tableRow)
129135

130-
// Ensure a named zone config applies to that named zone and no others.
131-
sqlutils.SetZoneConfig(t, sqlDB, "RANGE meta", gcOverride)
132-
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultRow, partialMetaRow, partialDbRow, partialTableRow)
133-
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", metaRow)
134-
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE system", defaultRow)
135-
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE system.lease", defaultRow)
136-
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE d", dbRow)
137-
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE d.t", tableRow)
136+
if includeMetaRange {
137+
// Ensure a named zone config applies to that named zone and no others.
138+
sqlutils.SetZoneConfig(t, sqlDB, "RANGE meta", gcOverride)
139+
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultRow, partialMetaRow, partialDbRow, partialTableRow)
140+
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", metaRow)
141+
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE system", defaultRow)
142+
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE system.lease", defaultRow)
143+
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE d", dbRow)
144+
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE d.t", tableRow)
145+
}
138146

139147
// Ensure updating the default zone propagates to zones without an override,
140148
// but not to those with overrides.
141149
sqlutils.SetZoneConfig(t, sqlDB, "RANGE default", gcOverride)
142-
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow, partialMetaRow, partialDbRow, partialTableRow)
143-
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", metaRow)
150+
if includeMetaRange {
151+
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow, partialMetaRow, partialDbRow, partialTableRow)
152+
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", metaRow)
153+
} else {
154+
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow, partialDbRow, partialTableRow)
155+
}
144156
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE system", defaultOverrideRow)
145157
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE system.lease", defaultOverrideRow)
146158
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE d", dbRow)
@@ -149,22 +161,34 @@ func TestValidSetShowZones(t *testing.T) {
149161
// Ensure deleting a database deletes only the database zone, and not the
150162
// table zone.
151163
sqlutils.DeleteZoneConfig(t, sqlDB, "DATABASE d")
152-
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow, partialMetaRow, partialTableRow)
164+
if includeMetaRange {
165+
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow, partialMetaRow, partialTableRow)
166+
} else {
167+
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow, partialTableRow)
168+
}
153169
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE d", defaultOverrideRow)
154170
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE d.t", tableRow)
155171

156172
// Ensure deleting a table zone works.
157173
sqlutils.DeleteZoneConfig(t, sqlDB, "TABLE d.t")
158-
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow, partialMetaRow)
174+
if includeMetaRange {
175+
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow, partialMetaRow)
176+
} else {
177+
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow)
178+
}
159179
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE d.t", defaultOverrideRow)
160180

161-
// Ensure deleting a named zone works.
162-
sqlutils.DeleteZoneConfig(t, sqlDB, "RANGE meta")
163-
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow)
164-
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", defaultOverrideRow)
181+
if includeMetaRange {
182+
// Ensure deleting a named zone works.
183+
sqlutils.DeleteZoneConfig(t, sqlDB, "RANGE meta")
184+
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultOverrideRow)
185+
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", defaultOverrideRow)
186+
}
165187

166188
// Ensure deleting non-overridden zones is not an error.
167-
sqlutils.DeleteZoneConfig(t, sqlDB, "RANGE meta")
189+
if includeMetaRange {
190+
sqlutils.DeleteZoneConfig(t, sqlDB, "RANGE meta")
191+
}
168192
sqlutils.DeleteZoneConfig(t, sqlDB, "DATABASE d")
169193
sqlutils.DeleteZoneConfig(t, sqlDB, "TABLE d.t")
170194

@@ -173,7 +197,9 @@ func TestValidSetShowZones(t *testing.T) {
173197
sqlutils.SetZoneConfig(t, sqlDB, "RANGE default", gcDefault)
174198
sqlutils.VerifyAllZoneConfigs(t, sqlDB, defaultRow)
175199
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE default", defaultRow)
176-
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", defaultRow)
200+
if includeMetaRange {
201+
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "RANGE meta", defaultRow)
202+
}
177203
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE system", defaultRow)
178204
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "TABLE system.lease", defaultRow)
179205
sqlutils.VerifyZoneConfigForTarget(t, sqlDB, "DATABASE d", defaultRow)
@@ -234,7 +260,7 @@ func TestZoneInheritField(t *testing.T) {
234260
defer leaktest.AfterTest(t)()
235261
defer log.Scope(t).Close(t)
236262

237-
params, _ := createTestServerParams()
263+
params, _ := createTestServerParamsAllowTenants()
238264
s, db, _ := serverutils.StartServer(t, params)
239265
defer s.Stopper().Stop(context.Background())
240266

@@ -281,7 +307,7 @@ func TestInvalidSetShowZones(t *testing.T) {
281307
defer leaktest.AfterTest(t)()
282308
defer log.Scope(t).Close(t)
283309

284-
params, _ := createTestServerParams()
310+
params, _ := createTestServerParamsAllowTenants()
285311
s, db, _ := serverutils.StartServer(t, params)
286312
defer s.Stopper().Stop(context.Background())
287313

0 commit comments

Comments
 (0)