Merge cockroachdb#84048

84048: row: only store the accounted for memory if the reservation is approved r=yuzefovich a=yuzefovich Previously, we would update the counter about the reserved memory before doing the reservation. If that reservation is denied, then later on, in `txnKVFetcher.close` we could try to release more memory than we registered. This is now fixed. Addresses: cockroachdb#83935. Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
wenyihu6 · Jul 9, 2022 · 6374bd8 · 6374bd8
2 parents ddb5c3d + bc21b0a
commit 6374bd8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/sql/row/kv_batch_fetcher.go b/pkg/sql/row/kv_batch_fetcher.go
@@ -356,10 +356,11 @@ func (f *txnKVFetcher) SetupNextFetch(
 
 	// Account for the memory of the spans that we're taking the ownership of.
 	if f.acc != nil {
-		f.spansAccountedFor = spans.MemUsage()
-		if err := f.acc.Grow(ctx, f.spansAccountedFor); err != nil {
+		newSpansAccountedFor := spans.MemUsage()
+		if err := f.acc.Grow(ctx, newSpansAccountedFor); err != nil {
 			return err
 		}
+		f.spansAccountedFor = newSpansAccountedFor
 	}
 
 	if spanIDs != nil && len(spans) != len(spanIDs) {