This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 7a764591f0cc6791c57929cbbe09f7b060a9aecc Author: Michael Blow <[email protected]> AuthorDate: Thu Aug 14 16:16:27 2025 -0400 [NO ISSUE][*DB][TEST] avoid exceptions on duplicate s3mock shutdowns Ext-ref: MB-68099 Change-Id: I36ef2b2b9f4ef335e226b89422450fdd1e4dec63 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20217 Tested-by: Jenkins <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> --- .../test/java/org/apache/asterix/api/common/LocalCloudUtil.java | 9 +++------ .../org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtil.java index 9e67c9217b..288583e393 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtil.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtil.java @@ -68,16 +68,12 @@ public class LocalCloudUtil { if (cleanStart) { FileUtils.deleteQuietly(new File(MOCK_FILE_BACKEND)); } + stopS3MockServer(); // Starting S3 mock server to be used instead of real S3 server LOGGER.info("Starting S3 mock server"); // Use file backend for debugging/inspection s3MockServer = new S3Mock.Builder().withPort(MOCK_SERVER_PORT).withFileBackend(MOCK_FILE_BACKEND).build(); - stopS3MockServer(); - try { - s3MockServer.start(); - } catch (Exception ex) { - // it might already be started, do nothing - } + s3MockServer.start(); LOGGER.info("S3 mock server started successfully"); S3ClientBuilder builder = S3Client.builder(); @@ -118,6 +114,7 @@ public class LocalCloudUtil { } catch (Exception ex) { // do nothing } + s3MockServer = null; } } } diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java index 95cdb1cfea..1aefadfc66 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java @@ -103,6 +103,7 @@ public class LocalCloudUtilAdobeMock { } catch (Exception ex) { // do nothing } + s3Mock = null; } } }
