From 7a7dde36896d683acf1fb8fca2646d00593b992f Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Tue, 3 Oct 2023 18:57:02 +0000 Subject: [PATCH 1/2] streamingccl: unskip TestStreamingRegionalConstraint This patch unskips TestStreamingRegionalConstraint under a non-stress build. Fixes #111541 Release note: none --- .../streamingccl/streamingest/replication_stream_e2e_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/ccl/streamingccl/streamingest/replication_stream_e2e_test.go b/pkg/ccl/streamingccl/streamingest/replication_stream_e2e_test.go index 3bfa20036c3d..1fd51179e1e0 100644 --- a/pkg/ccl/streamingccl/streamingest/replication_stream_e2e_test.go +++ b/pkg/ccl/streamingccl/streamingest/replication_stream_e2e_test.go @@ -1169,8 +1169,8 @@ func TestLoadProducerAndIngestionProgress(t *testing.T) { func TestStreamingRegionalConstraint(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - skip.WithIssue(t, 111541) skip.UnderStressRace(t, "takes too long under stress race") + skip.UnderStress(t, "the allocator machinery stuggles with cpu contention, which can cause the test to timeout") ctx := context.Background() regions := []string{"mars", "venus", "mercury"} From f3dd1847285b8e8306ae21daa2bf412388184123 Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Wed, 18 Oct 2023 12:44:52 +0000 Subject: [PATCH 2/2] streamingst: increase timeout on TestStreamingRegionalConstraint Informs #111541 Release note: none --- .../streamingest/replication_stream_e2e_test.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/ccl/streamingccl/streamingest/replication_stream_e2e_test.go b/pkg/ccl/streamingccl/streamingest/replication_stream_e2e_test.go index 1fd51179e1e0..669ae9053a15 100644 --- a/pkg/ccl/streamingccl/streamingest/replication_stream_e2e_test.go +++ b/pkg/ccl/streamingccl/streamingest/replication_stream_e2e_test.go @@ -1218,11 +1218,13 @@ func TestStreamingRegionalConstraint(t *testing.T) { c.SrcSysServer.DB(), srcCodec, "test", "x") destCodec := keys.MakeSQLCodec(c.Args.DestTenantID) - testutils.SucceedsSoon(t, - checkLocalities(tableDesc.PrimaryIndexSpan(srcCodec), rangedesc.NewScanner(c.SrcSysServer.DB()))) + testutils.SucceedsWithin(t, + checkLocalities(tableDesc.PrimaryIndexSpan(srcCodec), rangedesc.NewScanner(c.SrcSysServer.DB())), + time.Second*45*5) - testutils.SucceedsSoon(t, - checkLocalities(tableDesc.PrimaryIndexSpan(destCodec), rangedesc.NewScanner(c.DestSysServer.DB()))) + testutils.SucceedsWithin(t, + checkLocalities(tableDesc.PrimaryIndexSpan(destCodec), rangedesc.NewScanner(c.DestSysServer.DB())), + time.Second*45*5) tableName := "test" tabledIDQuery := fmt.Sprintf(`SELECT id FROM system.namespace WHERE name ='%s'`, tableName)