>From Michael Blow <mb...@apache.org>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20217 )
( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: [NO ISSUE][*DB][TEST] avoid exceptions on duplicate s3mock shutdowns ...................................................................... [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 <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Hussain Towaileb <hussai...@gmail.com> --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java 2 files changed, 17 insertions(+), 6 deletions(-) Approvals: Hussain Towaileb: Looks good to me, approved Jenkins: Verified 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 9e67c92..288583e 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 @@ 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 @@ } 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 95cdb1c..1aefadf 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 @@ } catch (Exception ex) { // do nothing } + s3Mock = null; } } } -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20217 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: ionic Gerrit-Change-Id: I36ef2b2b9f4ef335e226b89422450fdd1e4dec63 Gerrit-Change-Number: 20217 Gerrit-PatchSet: 6 Gerrit-Owner: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Hussain Towaileb <hussai...@gmail.com> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-MessageType: merged
