Merge #153627

153627: explain_test: deflake TestContentionTimeOnWrites r=mw5h a=mw5h

This test that introduces contention on writes for testing purposes wasn't retrying retriable errors. In this case, it appears that the wait we inserted to ensure the we can see the contention in the second worker has pushed us over the limit into "too old" territory.

Because of the non-trivial amount of semaphore logic, we just tear the whole thing down and retry it instead of localizing the retry logic in the worker getting these errors.

Fixes: #153394
Release note: None

Co-authored-by: Matt White <[email protected]>

Author: craig[bot]

pkg/sql/opt/exec/explain/output_test.go

@@ -231,6 +231,8 @@ func TestContentionTimeOnWrites(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderDuress(t, "see issue #153394")
+
 	ctx := context.Background()
 	s, conn, _ := serverutils.StartServer(t, base.TestServerArgs{})
 	defer s.Stopper().Stop(ctx)