Merge #157782

157782: sql: deflake TestDropWithDeletedDescriptor test r=fqazi a=fqazi

Previously, TestDropWithDeletedDescriptor could flake if we wound up retrying at the KV DistSender, when communicating with the replica. This can happen under race / stress testing. To address this, this patch ensures the hook used by this test is only evaluated once.

Fixes: #157063

Release note: None

Co-authored-by: Faizan Qazi <[email protected]>

Author: craig[bot]

pkg/sql/gcjob_test/gc_job_test.go

@@ -10,6 +10,7 @@ import (
 	gosql "database/sql"
 	"fmt"
 	"strconv"
+	"sync"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -609,6 +610,8 @@ func TestDropWithDeletedDescriptor(t *testing.T) {
 	runTest := func(t *testing.T, dropIndex bool, beforeDelRange bool) {
 		ctx, cancel := context.WithCancel(context.Background())
 		gcJobID := make(chan jobspb.JobID)
+		var hookShouldExecuteOnce sync.Once
+
 		knobs := base.TestingKnobs{
 			JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(),
 			GCJob: &sql.GCJobTestingKnobs{
@@ -645,15 +648,19 @@ func TestDropWithDeletedDescriptor(t *testing.T) {
 					if len(k) == 0 {
 						return nil
 					}
-					ch := make(chan struct{})
-					select {
-					case delRangeChan <- ch:
-					case <-ctx.Done():
-					}
-					select {
-					case <-ch:
-					case <-ctx.Done():
-					}
+					// Disable the channel logic after the first execution in case
+					// any retries happen in the KV dist sender.
+					hookShouldExecuteOnce.Do(func() {
+						ch := make(chan struct{})
+						select {
+						case delRangeChan <- ch:
+						case <-ctx.Done():
+						}
+						select {
+						case <-ch:
+						case <-ctx.Done():
+						}
+					})
 					return nil
 				},
 			}