>From Hussain Towaileb <[email protected]>: Hussain Towaileb has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21228?usp=email )
Change subject: [NO ISSUE][OTH] Shutdown s3Mock before start ...................................................................... [NO ISSUE][OTH] Shutdown s3Mock before start - user model changes: no - storage format changes: no - interface changes: no The LocalCloudUtil.startS3CloudEnvironment() always stops the s3Mock before starting it. Make LocalCloudUtilAdobeMock do the same thing. Ext-ref: MB-68099 Change-Id: I10ea8fe99f81ffacdcd302fe7cad47f139b920f1 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21228 Integration-Tests: Ian Maxon <[email protected]> Tested-by: Ian Maxon <[email protected]> Reviewed-by: Ian Maxon <[email protected]> --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/LocalCloudUtilAdobeMock.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageUnstableTest.java 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Ian Maxon: Looks good to me, approved; Verified; Verified 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 9b366da..e40e931 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 @@ -87,6 +87,7 @@ if (System.getProperty("api.version") == null) { System.setProperty("api.version", "1.44"); } + shutdownSilently(); // Starting S3 mock server to be used instead of real S3 server LOGGER.info("Starting S3 mock server"); s3Mock = new S3MockContainer(S3MOCK_VERSION_TAG).withRetainFilesOnExit(!cleanStart) diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageUnstableTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageUnstableTest.java index ccb6984..973f133 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageUnstableTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageUnstableTest.java @@ -86,6 +86,7 @@ public static void tearDown() throws Exception { System.clearProperty(CloudRetryableRequestUtil.CLOUD_UNSTABLE_MODE); LangExecutionUtil.tearDown(); + LocalCloudUtilAdobeMock.shutdownSilently(); } @Parameters(name = "CloudStorageUnstableTest {index}: {0}") -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21228?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: lumina Gerrit-Change-Id: I10ea8fe99f81ffacdcd302fe7cad47f139b920f1 Gerrit-Change-Number: 21228 Gerrit-PatchSet: 3 Gerrit-Owner: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-CC: Anon. E. Moose #1000171
