Merge #95744

95744: kvserver: don't NPE in poisonInflightLatches r=erikgrinaker a=tbg I still don't understand how we can get a finished endCmds here, but while I scratch my head we don't need to be collecting CI failures. Touches #86547. Closes #94209. Epic: none Release note: None Co-authored-by: Tobias Grieger <[email protected]>
cockroachdb · Jan 24, 2023 · 778b6fb · 778b6fb
2 parents dc974cd + 40617ed
commit 778b6fb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/kv/kvserver/replica_raft.go b/pkg/kv/kvserver/replica_raft.go
@@ -1361,7 +1361,9 @@ func (r *Replica) poisonInflightLatches(err error) {
 	defer r.mu.Unlock()
 	for _, p := range r.mu.proposals {
 		p.ec.poison()
-		if p.ec.g.Req.PoisonPolicy == poison.Policy_Error {
+		// TODO(tbg): find out how `p.ec.done()` can have been called at this point,
+		// See: https://github.com/cockroachdb/cockroach/issues/86547
+		if p.ec.g != nil && p.ec.g.Req.PoisonPolicy == poison.Policy_Error {
 			aErr := roachpb.NewAmbiguousResultError(err)
 			// NB: this does not release the request's latches. It's important that
 			// the latches stay in place, since the command could still apply.