IGNITE-23299 Fix inflights tracking for RO transactions on cursor clo…

…se when transaction is rolling back (#4464)
apache · Sep 27, 2024 · a8ca579 · a8ca579
1 parent ac86966
commit a8ca579
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/...ain/java/org/apache/ignite/internal/table/distributed/storage/PartitionScanPublisher.java b/...ain/java/org/apache/ignite/internal/table/distributed/storage/PartitionScanPublisher.java
@@ -179,12 +179,11 @@ private void scanBatch(int n) {
 
             inflightBatchRequestTracker.onRequestBegin();
 
-            retrieveBatch(scanId, n).thenAccept(binaryRows -> {
+            CompletableFuture<Collection<T>> retriveBatchFuture = retrieveBatch(scanId, n);
+            retriveBatchFuture.whenComplete((batch, err) -> inflightBatchRequestTracker.onRequestEnd()).thenAccept(binaryRows -> {
                 assert binaryRows != null;
                 assert binaryRows.size() <= n : "Rows more then requested " + binaryRows.size() + " " + n;
 
-                inflightBatchRequestTracker.onRequestEnd();
-
                 binaryRows.forEach(subscriber::onNext);
 
                 if (binaryRows.size() < n) {
@@ -197,8 +196,6 @@ private void scanBatch(int n) {
                     }
                 }
             }).exceptionally(t -> {
-                inflightBatchRequestTracker.onRequestEnd();
-
                 cancel(t, false);
 
                 return null;