Merge #143881

143881: kvnemesis: avoid double-close of batch r=miraradeva a=stevendanna

The `batch` variable that we were calling Close() on here might be overwritten if a savepoint rollback is encountered. The defer would actually then be a second Close() since we close all savepoint-generated batches in a loop.

Here, we use two variables to avoid this double-close.

Fixes #143873

Release note: None

Co-authored-by: Steven Danna <[email protected]>

Author: craig[bot]

pkg/kv/kvnemesis/validator.go

@@ -1038,8 +1038,8 @@ func (v *validator) checkAtomicCommitted(
 	// it, un-hiding each of them as we encounter each write, and using the
 	// current state of the view as we encounter each read. Luckily this is easy
 	// to do by with a pebble.Batch "view".
-	batch := v.kvs.kvs.NewIndexedBatch()
-	defer func() { _ = batch.Close() }()
+	firstBatch := v.kvs.kvs.NewIndexedBatch()
+	defer func() { _ = firstBatch.Close() }()
 
 	var failure string
 	// writeTS is populated with the timestamp of the materialized observed writes
@@ -1068,6 +1068,7 @@ func (v *validator) checkAtomicCommitted(
 	// rollbackSp = observedSavepoint{...} when the observedSavepoint object
 	// contains a rollback for which we haven't encountered a matching create yet.
 	var rollbackSp *observedSavepoint = nil
+	batch := firstBatch
 	for idx := len(txnObservations) - 1; idx >= 0; idx-- {
 		observation := txnObservations[idx]
 		switch o := observation.(type) {