fixup! kvserver: prevent finished proposal from being present in proposals map

tbg · tbg · commit ac23f4667f5b · 2023-02-06T08:39:28.000+01:00
diff --git a/pkg/kv/kvserver/apply/task.go b/pkg/kv/kvserver/apply/task.go
@@ -272,8 +272,8 @@ func (t *Task) ApplyCommittedEntries(ctx context.Context) error {
 				}); rejectErr != nil {
 					return rejectErr
 				}
-				return err
 			}
+			return err
 		}
 	}
 	iter.Close()
diff --git a/pkg/kv/kvserver/replica_test.go b/pkg/kv/kvserver/replica_test.go
@@ -8123,14 +8123,6 @@ func TestReplicaRefreshMultiple(t *testing.T) {
 	ba.Add(inc)
 	ba.Timestamp = tc.Clock().Now()
 
-	st := repl.CurrentLeaseStatus(ctx)
-	proposal, pErr := repl.requestToProposal(ctx, incCmdID, ba, allSpansGuard(), &st, uncertainty.Interval{})
-	if pErr != nil {
-		t.Fatal(pErr)
-	}
-	// Save this channel; it may get reset to nil before we read from it.
-	proposalDoneCh := proposal.doneCh
-
 	g, _, pErr := repl.concMgr.SequenceReq(ctx, nil /* guard */, concurrency.Request{
 		Txn:             ba.Txn,
 		Timestamp:       ba.Timestamp,
@@ -8144,6 +8136,14 @@ func TestReplicaRefreshMultiple(t *testing.T) {
 	}, concurrency.PessimisticEval)
 	require.NoError(t, pErr.GoError())
 
+	st := repl.CurrentLeaseStatus(ctx)
+	proposal, pErr := repl.requestToProposal(ctx, incCmdID, ba, allSpansGuard(), &st, uncertainty.Interval{})
+	if pErr != nil {
+		t.Fatal(pErr)
+	}
+	// Save this channel; it may get reset to nil before we read from it.
+	proposalDoneCh := proposal.doneCh
+
 	proposal.ec = endCmds{
 		repl: repl,
 		g:    g,

Original file line number	Diff line number	Diff line change
`@@ -272,8 +272,8 @@ func (t *Task) ApplyCommittedEntries(ctx context.Context) error {`
`272`	`272`	`}); rejectErr != nil {`
`273`	`273`	`return rejectErr`
`274`	`274`	`}`
`275`		`- return err`
`276`	`275`	`}`
	`276`	`+ return err`
`277`	`277`	`}`
`278`	`278`	`}`
`279`	`279`	`iter.Close()`