kvserver: defer unlock in maybeCoalesceHeartbeat

Release note: None Part of: cockroachdb#105366
andrewbaptist · May 14, 2024 · da9eadd · da9eadd
1 parent 564793c
commit da9eadd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/pkg/kv/kvserver/replica_raft.go b/pkg/kv/kvserver/replica_raft.go
@@ -1588,9 +1588,11 @@ func (r *Replica) maybeCoalesceHeartbeat(
 	switch msg.Type {
 	case raftpb.MsgHeartbeat:
 		r.store.coalescedMu.Lock()
+		defer r.store.coalescedMu.Unlock()
 		hbMap = r.store.coalescedMu.heartbeats
 	case raftpb.MsgHeartbeatResp:
 		r.store.coalescedMu.Lock()
+		defer r.store.coalescedMu.Unlock()
 		hbMap = r.store.coalescedMu.heartbeatResponses
 	default:
 		return false
@@ -1613,7 +1615,6 @@ func (r *Replica) maybeCoalesceHeartbeat(
 		NodeID:  toReplica.NodeID,
 	}
 	hbMap[toStore] = append(hbMap[toStore], beat)
-	r.store.coalescedMu.Unlock()
 	return true
 }