Merge #148917 #148932

148917: kvcoord: add logging in TestWaiterOnRejectedCommit r=tbg a=pav-kv

This should help debugging/deflaking this test should it fail again. The conjecture is that we end up with more than one command ID, and only one gets the injected error, while another one succeeds.

Informs #148910

148932: kvcoord: deflake TestGetFirstRangeDescriptor r=tbg a=pav-kv

Make sure the gossip network is established before running the gossip simulation loop.

Fixes #148900

Co-authored-by: Pavel Kalinnikov <[email protected]>

Author: craig[bot]

pkg/kv/kvclient/kvcoord/dist_sender_test.go

@@ -2072,6 +2072,11 @@ func TestGetFirstRangeDescriptor(t *testing.T) {
 		node.Gossip.EnableSimulationCycler(false)
 	}
 	n.Start()
+	// Make sure the first two nodes are connected via gossip.
+	n.SimulateNetwork(func(_ int, _ *simulation.Network) bool { return false })
+	<-n.Nodes[0].Gossip.Connected
+	<-n.Nodes[1].Gossip.Connected
+
 	ds := NewDistSender(DistSenderConfig{
 		AmbientCtx:         log.MakeTestingAmbientContext(stopper.Tracer()),
 		NodeDescs:          n.Nodes[0].Gossip,

pkg/kv/kvclient/kvcoord/integration_test.go

@@ -85,6 +85,7 @@ func TestWaiterOnRejectedCommit(t *testing.T) {
 					if !ba.Txn.ID.Equal(v.(uuid.UUID)) {
 						return nil
 					}
+					t.Logf("EndTxn command ID: %v", args.CmdID)
 					commitCmdID.Store(args.CmdID)
 					return nil
 				},
@@ -99,10 +100,12 @@ func TestWaiterOnRejectedCommit(t *testing.T) {
 					if args.CmdID == cmdID {
 						if illegalLeaseIndex {
 							illegalLeaseIndex = false
-							// NB: 1 is proposalIllegalLeaseIndex.
+							t.Logf("injecting illegal lease index for %v", cmdID)
+							// NB: 1 is ProposalRejectionIllegalLeaseIndex.
 							return 1, kvpb.NewErrorf("test injected err (illegal lease index)")
 						}
-						// NB: 0 is proposalNoReevaluation.
+						t.Logf("injecting permanent rejection for %v", cmdID)
+						// NB: 0 is ProposalRejectionPermanent.
 						return 0, kvpb.NewErrorf("test injected err")
 					}
 					return 0, nil
@@ -162,6 +165,7 @@ func TestWaiterOnRejectedCommit(t *testing.T) {
 			t.Fatal(err)
 		}
 	}
+	t.Logf("txn ID: %v", txn.ID())
 	txnID.Store(txn.ID())
 
 	readerDone := make(chan error, 2)