From d7442493deff7c2ed5181477e1674978f6ab53af Mon Sep 17 00:00:00 2001 From: Adam Storm Date: Wed, 22 Mar 2023 12:42:29 +0000 Subject: [PATCH] multitenant: re-enable TestTenantUpgradeInterlock TestTenantUpgradeInterlock was skipped with #99121 because it was timing out regularly. In response to the timeouts however, #98997 was merged to increase the timeout duration for the test (since its run length is proportional to the number of migrations in the release, which has been increasing). Unfortuntely, our wires got crossed and the skip was introduced before the test had a chance to run with the new timeout. #98987 hasn't shown a failure with the new timeout length, so it may be the case that the longer timeout has resolved the problem. Reenabling the test to see if it has better success under the new timeout length. Fixes: #98987 Epic: None Release note: None --- pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go b/pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go index b7b5eaaf214c..ba272c146d2d 100644 --- a/pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go +++ b/pkg/ccl/kvccl/kvtenantccl/tenant_upgrade_test.go @@ -403,7 +403,6 @@ func TestTenantUpgradeFailure(t *testing.T) { // is too low. func TestTenantUpgradeInterlock(t *testing.T) { defer leaktest.AfterTest(t)() - skip.WithIssue(t, 98987) // Times out under stress race skip.UnderStressRace(t) // Test takes 30s to run