>From Murtadha Hubail <mhub...@apache.org>: Murtadha Hubail has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19147 )
Change subject: [NO ISSUE]: Fix AzureBlobStorageExternalDatasetOnePartitionTest ...................................................................... [NO ISSUE]: Fix AzureBlobStorageExternalDatasetOnePartitionTest - user model changes: no - storage format changes: no - interface changes: no details: - Opening an input stream on empty blobs in azurite throws a null pointer exception in versions > 3.31.0. https://github.com/Azure/Azurite/issues/2458 - Use a less conflicting port for gcs tests Change-Id: Ia6dff5172b91f0d0e8a26c0e69aceff3b74896c2 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19147 Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Murtadha Hubail <mhub...@apache.org> --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageGCSTest.java M asterixdb/asterix-cloud/pom.xml M asterixdb/asterix-cloud/src/test/java/org/apache/asterix/cloud/gcs/LSMGCSTest.java 5 files changed, 29 insertions(+), 6 deletions(-) Approvals: Murtadha Hubail: Looks good to me, approved Jenkins: Verified; Verified Anon. E. Moose #1000171: diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index 63bb7da..950ff4e 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -326,7 +326,7 @@ <workingDirectory>${project.build.directory}/fake-gcs-server</workingDirectory> <arguments> <argument>-port</argument> - <argument>4443</argument> + <argument>24443</argument> <argument>-scheme</argument> <argument>http</argument> <argument>-host</argument> @@ -447,7 +447,7 @@ <goal>npm</goal> </goals> <configuration> - <arguments>install azurite</arguments> + <arguments>install azurite@3.31.0</arguments> </configuration> </execution> </executions> diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageGCSTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageGCSTest.java index 3a03445..a60acb7 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageGCSTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/cloud_storage/CloudStorageGCSTest.java @@ -66,7 +66,7 @@ private static final String CONFIG_FILE_NAME = "src/test/resources/cc-cloud-storage-gcs.conf"; private static final String DELTA_RESULT_PATH = "results_cloud"; private static final String EXCLUDED_TESTS = "MP"; - public static final String MOCK_SERVER_HOSTNAME = "http://127.0.0.1:4443";; + public static final String MOCK_SERVER_HOSTNAME = "http://127.0.0.1:24443";; private static final String MOCK_SERVER_PROJECT_ID = "asterixdb-gcs-test-project-id"; public CloudStorageGCSTest(TestCaseContext tcCtx) { diff --git a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf index 3c883a8..55caad6 100644 --- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf @@ -67,6 +67,6 @@ cloud.storage.scheme=gs cloud.storage.bucket=cloud-storage-container cloud.storage.region=us-west2 -cloud.storage.endpoint=http://127.0.0.1:4443 +cloud.storage.endpoint=http://127.0.0.1:24443 cloud.storage.anonymous.auth=true cloud.storage.cache.policy=selective diff --git a/asterixdb/asterix-cloud/pom.xml b/asterixdb/asterix-cloud/pom.xml index 659a6d7..0ab291d 100644 --- a/asterixdb/asterix-cloud/pom.xml +++ b/asterixdb/asterix-cloud/pom.xml @@ -117,7 +117,7 @@ <workingDirectory>${project.build.directory}/fake-gcs-server</workingDirectory> <arguments> <argument>-port</argument> - <argument>4443</argument> + <argument>24443</argument> <argument>-scheme</argument> <argument>http</argument> <argument>-host</argument> diff --git a/asterixdb/asterix-cloud/src/test/java/org/apache/asterix/cloud/gcs/LSMGCSTest.java b/asterixdb/asterix-cloud/src/test/java/org/apache/asterix/cloud/gcs/LSMGCSTest.java index 3c62cce..ad14c54 100644 --- a/asterixdb/asterix-cloud/src/test/java/org/apache/asterix/cloud/gcs/LSMGCSTest.java +++ b/asterixdb/asterix-cloud/src/test/java/org/apache/asterix/cloud/gcs/LSMGCSTest.java @@ -34,7 +34,7 @@ public class LSMGCSTest extends AbstractLSMTest { private static Storage client; - private static final int MOCK_SERVER_PORT = 4443; + private static final int MOCK_SERVER_PORT = 24443; private static final String MOCK_SERVER_HOSTNAME = "http://127.0.0.1:"; + MOCK_SERVER_PORT; private static final String MOCK_SERVER_REGION = "us-west2"; // does not matter the value private static final String MOCK_SERVER_PROJECT_ID = "asterixdb-gcs-test-project-id"; -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19147 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: goldfish Gerrit-Change-Id: Ia6dff5172b91f0d0e8a26c0e69aceff3b74896c2 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 3 Gerrit-Owner: Savyasach Reddy <savyasach.enuko...@couchbase.com> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Murtadha Hubail <mhub...@apache.org> Gerrit-MessageType: merged
