This is an automated email from the ASF dual-hosted git repository. mhubail pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 01ef165f3b321f2d329388fc88442158780ed457 Author: Ali Alsuliman <[email protected]> AuthorDate: Tue Apr 8 11:27:06 2025 -0700 [ASTERIXDB-3591][RT] Ensure all search cursors closed - user model changes: no - storage format changes: no - interface changes: no Details: Ensure all search cursors closed to make sure cloud streams are closed. Ext-ref: MB-66048 Change-Id: Id044489573e5ef50b5bae4b7ba8fa36cd10cbfcf Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19632 Reviewed-by: Ritik Raj <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> --- .../storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java | 7 ++++++- .../hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java index 9740bc42a5..9dd8611d0a 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java @@ -31,6 +31,7 @@ import org.apache.hyracks.storage.am.btree.impls.RangePredicate; import org.apache.hyracks.storage.am.common.api.ILSMIndexCursor; import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor; import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters; +import org.apache.hyracks.storage.am.common.util.ResourceReleaseUtils; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.LSMComponentType; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilter; @@ -288,11 +289,15 @@ public class LSMBTreePointSearchCursor extends EnforcedIndexCursor implements IL protected void closeCursors() throws HyracksDataException { if (btreeCursors != null) { + Throwable failure = null; for (int i = 0; i < numBTrees; ++i) { if (btreeCursors[i] != null) { - btreeCursors[i].close(); + failure = ResourceReleaseUtils.close(btreeCursors[i], failure); } } + if (failure != null) { + throw HyracksDataException.create(failure); + } } } diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java index 2c972210fb..d53e686438 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java @@ -28,6 +28,7 @@ import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder; import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference; import org.apache.hyracks.storage.am.common.api.ILSMIndexCursor; import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters; +import org.apache.hyracks.storage.am.common.util.ResourceReleaseUtils; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent; import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilter; import org.apache.hyracks.storage.am.lsm.common.api.ILSMHarness; @@ -127,8 +128,12 @@ public abstract class LSMIndexSearchCursor extends EnforcedIndexCursor implement } if (rangeCursors != null) { + Throwable failure = null; for (int i = 0; i < rangeCursors.length; i++) { - rangeCursors[i].close(); + failure = ResourceReleaseUtils.close(rangeCursors[i], failure); + } + if (failure != null) { + throw HyracksDataException.create(failure); } } } finally {
