This is an automated email from the ASF dual-hosted git repository.
alsuliman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 95abfda5ab [ASTERIXDB-3618][STO] Close Library Downloader
95abfda5ab is described below
commit 95abfda5ab061f19e63a7739ce1b9b3a98032832
Author: Ian Maxon <[email protected]>
AuthorDate: Tue Jun 3 15:53:39 2025 -0700
[ASTERIXDB-3618][STO] Close Library Downloader
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
The IParallelDownloader instances used to page in
libraries from S3 aren't being closed, which is
not good. Fix this, and make IParallelDownloader
an AutoCloseable.
Ext-ref: MB-67071
Change-Id: I524cbfb6685bd3c123a6ad2db48482e5a2a1ce61
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19869
Reviewed-by: Ali Alsuliman <[email protected]>
Reviewed-by: Ian Maxon <[email protected]>
Tested-by: Jenkins <[email protected]>
Integration-Tests: Jenkins <[email protected]>
---
.../asterix/cloud/AbstractCloudIOManager.java | 22 ++++++++++++----------
.../asterix/cloud/clients/IParallelDownloader.java | 2 +-
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/AbstractCloudIOManager.java
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/AbstractCloudIOManager.java
index 0ef2011f6c..ab93f391ae 100644
---
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/AbstractCloudIOManager.java
+++
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/AbstractCloudIOManager.java
@@ -196,19 +196,21 @@ public abstract class AbstractCloudIOManager extends
IOManager implements IParti
@Override
public void downloadLibrary(Collection<FileReference> libPath) throws
HyracksDataException {
- IParallelDownloader downloader =
cloudClient.createParallelDownloader(bucket, localIoManager);
- LOGGER.info("Downloading all files located in {}", libPath);
- downloader.downloadDirectories(libPath);
- LOGGER.info("Finished downloading {}", libPath);
+ try (IParallelDownloader downloader =
cloudClient.createParallelDownloader(bucket, localIoManager)) {
+ LOGGER.info("Downloading all files located in {}", libPath);
+ downloader.downloadDirectories(libPath);
+ LOGGER.info("Finished downloading {}", libPath);
+ }
}
public void downloadAllLibraries() throws HyracksDataException {
- IParallelDownloader downloader =
cloudClient.createParallelDownloader(bucket, localIoManager);
- FileReference appDir = resolveAbsolutePath(
- localIoManager.getWorkspacePath(0).getPath() + File.separator
+ APPLICATION_ROOT_DIR_NAME);
- LOGGER.info("Downloading all libraries in + {}", appDir);
- downloader.downloadDirectories(Collections.singletonList(appDir));
- LOGGER.info("Finished downloading all libraries");
+ try (IParallelDownloader downloader =
cloudClient.createParallelDownloader(bucket, localIoManager)) {
+ FileReference appDir = resolveAbsolutePath(
+ localIoManager.getWorkspacePath(0).getPath() +
File.separator + APPLICATION_ROOT_DIR_NAME);
+ LOGGER.info("Downloading all libraries in + {}", appDir);
+ downloader.downloadDirectories(Collections.singletonList(appDir));
+ LOGGER.info("Finished downloading all libraries");
+ }
}
/*
diff --git
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/IParallelDownloader.java
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/IParallelDownloader.java
index 184e015bba..22de1e9586 100644
---
a/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/IParallelDownloader.java
+++
b/asterixdb/asterix-cloud/src/main/java/org/apache/asterix/cloud/clients/IParallelDownloader.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.io.FileReference;
-public interface IParallelDownloader {
+public interface IParallelDownloader extends AutoCloseable {
/**
* Downloads files in all partitions
