rangefeed: make TestUnrecoverableErrors work with multi-tenancy

This test wants to see errors because of strict GC enforcement policies.
To do so, it creates a scratch range and tries to trigger an error
there. Strict GC enforcement policies don't apply to the scratch range
out of the box, so to sidestep this, the test would explicitly configure
the scratch range's span config. This explicit configuration only worked
for the system tenant previously; this patch extends it to secondary
tenants.

Closes #109472

Release note: None

Author: arulajmani

pkg/kv/kvclient/rangefeed/rangefeed_external_test.go

@@ -952,7 +952,6 @@ func TestUnrecoverableErrors(t *testing.T) {
 		// handle duplicated events.
 		kvserver.RangefeedUseBufferedSender.Override(ctx, &settings.SV, rt.useBufferedSender)
 		srv, sqlDB, kvDB := serverutils.StartServer(t, base.TestServerArgs{
-			DefaultTestTenant: base.TestIsForStuffThatShouldWorkWithSecondaryTenantsButDoesntYet(109472),
 			Knobs: base.TestingKnobs{
 				SpanConfig: &spanconfig.TestingKnobs{
 					ConfigureScratchRange: true,

pkg/spanconfig/spanconfigsqltranslator/sqltranslator.go

@@ -661,7 +661,7 @@ func (s *SQLTranslator) maybeGeneratePseudoTableRecords(
 func (s *SQLTranslator) maybeGenerateScratchRangeRecord(
 	ctx context.Context, ids descpb.IDs,
 ) (spanconfig.Record, error) {
-	if !s.knobs.ConfigureScratchRange || !s.codec.ForSystemTenant() {
+	if !s.knobs.ConfigureScratchRange {
 		return spanconfig.Record{}, nil // nothing to do
 	}
 
@@ -677,10 +677,12 @@ func (s *SQLTranslator) maybeGenerateScratchRangeRecord(
 			return spanconfig.Record{}, err
 		}
 
+		scratchKey := append(s.codec.TenantPrefix(), keys.ScratchRangeMin...)
+		scratchKey = scratchKey[:len(scratchKey):len(scratchKey)]
 		record, err := spanconfig.MakeRecord(
 			spanconfig.MakeTargetFromSpan(roachpb.Span{
-				Key:    keys.ScratchRangeMin,
-				EndKey: keys.ScratchRangeMax,
+				Key:    scratchKey,
+				EndKey: scratchKey.PrefixEnd(),
 			}), zone.AsSpanConfig())
 		if err != nil {
 			return spanconfig.Record{}, err