Merge #155167 #155195

155167: spanconfigreconcilerccl: deflake spanconfigreconcilerccl_test r=fqazi a=fqazi

Previously, the span config reconciller tests when running under a tenant did not use the transactional descriptor ID generator, which could lead to flake. Additionally, the transactional ID generator also was not being used for creating internal objects, when the testing knob is enabled. This patch fixes the multi-tenant tests to use the transactional ID generator and enables it for internal queries as well.

Fixes: #154585

Release note: None

155195: sql: prevent stack overflow with infinite loops in test builds r=yuzefovich a=yuzefovich

We just saw a test case where we hit stack overflow when handling a DO block with an infinite loop and `tail-call-optimization-enabled` metamorphic variable happened to use `false`. In this case, it's expected behavior that we'd be hitting the stack overflow, so in order to prevent such crashes in tests, we now do a depth check (similar to trigger depth check) to error out at the depth of 10000.

Additionally, this commit removes disabling DO blocks in a single test that hit this stack overflow first as well as includes a few expected errors I saw in the artifacts into the set of ignored ones.

Fixes: #155136.
Release note: None

Co-authored-by: Faizan Qazi <faizan@cockroachlabs.com>
Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com>

Author: 3 people

pkg/compose/compare/compare/compare_test.go

@@ -80,7 +80,7 @@ func TestCompare(t *testing.T) {
 	configs := map[string]testConfig{
 		"mutators": {
 			setup:           sqlsmith.Setups[sqlsmith.RandTableSetupName],
-			opts:            []sqlsmith.SmitherOption{sqlsmith.CompareMode(), sqlsmith.DisableDoBlocks()},
+			opts:            []sqlsmith.SmitherOption{sqlsmith.CompareMode()},
 			ignoreSQLErrors: true,
 			conns: []testConn{
 				{

pkg/spanconfig/spanconfigtestutils/spanconfigtestcluster/cluster.go

@@ -71,6 +71,9 @@ func (h *Handle) InitializeTenant(ctx context.Context, tenID roachpb.TenantID) *
 				SpanConfig:     h.scKnobs,
 				GCJob:          &tenantGCJobKnobs,
 				UpgradeManager: serverUpgradeKnobs,
+				SQLExecutor: &sql.ExecutorTestingKnobs{
+					UseTransactionalDescIDGenerator: true,
+				},
 			},
 		}
 		var err error

pkg/sql/planner.go

@@ -24,6 +24,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catsessiondata"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/colinfo"
+	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descidgen"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descs"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/lease"
@@ -462,6 +463,9 @@ func newInternalPlanner(
 	p.extendedEvalCtx.NodeID = execCfg.NodeInfo.NodeID
 	p.extendedEvalCtx.Locality = execCfg.Locality
 	p.extendedEvalCtx.DescIDGenerator = execCfg.DescIDGenerator
+	if execCfg.TestingKnobs.UseTransactionalDescIDGenerator && txn != nil {
+		p.extendedEvalCtx.DescIDGenerator = descidgen.NewTransactionalGenerator(execCfg.Settings, execCfg.Codec, txn)
+	}
 
 	p.sessionDataMutatorIterator = smi
 

pkg/sql/routine.go

@@ -22,6 +22,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/sqltelemetry"
 	"github.com/cockroachdb/cockroach/pkg/sql/types"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
+	"github.com/cockroachdb/cockroach/pkg/util/buildutil"
 	"github.com/cockroachdb/cockroach/pkg/util/metamorphic"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/cockroach/pkg/util/tracing"
@@ -155,6 +156,20 @@ func (p *planner) EvalRoutineExpr(
 		}
 		ctx = context.WithValue(ctx, triggerDepthKey{}, triggerDepth+1)
 	}
+	if buildutil.CrdbTestBuild && !tailCallOptimizationEnabled {
+		// In test builds when we disable tail-call optimization, we might hit
+		// stack overflow with infinite loops.
+		var routineDepth int
+		if routineDepthValue := ctx.Value(routineDepthKey{}); routineDepthValue != nil {
+			routineDepth = routineDepthValue.(int)
+		}
+		const maxDepth = 10000
+		if routineDepth > maxDepth {
+			return nil, pgerror.Newf(pgcode.ProgramLimitExceeded,
+				"routine reached recursion depth limit: %d (probably infinite loop)", maxDepth)
+		}
+		ctx = context.WithValue(ctx, routineDepthKey{}, routineDepth+1)
+	}
 
 	var g routineGenerator
 	g.init(p, expr, args)
@@ -193,6 +208,8 @@ func (p *planner) EvalRoutineExpr(
 
 type triggerDepthKey struct{}
 
+type routineDepthKey struct{}
+
 // RoutineExprGenerator returns an eval.ValueGenerator that produces the results
 // of a routine.
 func (p *planner) RoutineExprGenerator(

pkg/sql/tests/rsg_test.go

@@ -641,12 +641,17 @@ var ignoredErrorPatterns = []string{
 	"BACKUP for requested time  needs option 'revision_history'",
 	"RESTORE timestamp: supplied backups do not cover requested time",
 	"a partial index that does not contain all the rows needed to execute this query",
+	"routine reached recursion depth limit",
+	"RETURN cannot have a parameter in a procedure",
+	"is not a known variable",
+	"could not produce a query plan conforming to the",
 
 	// Numeric conditions
 	"exponent out of range",
 	"result out of range",
 	"argument out of range",
 	"integer out of range",
+	"OID out of range",
 	"invalid operation",
 	"invalid mask",
 	"cannot take square root of a negative number",
@@ -680,7 +685,8 @@ var ignoredErrorPatterns = []string{
 	"unrecognized privilege",
 	"invalid escape string",
 	"error parsing regexp",
-	"could not parse .* as type bytes",
+	"could not parse",
+	"error parsing EWKB",
 	"UUID must be exactly 16 bytes long",
 	"unsupported timespan",
 	"does not exist",