honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix GCS Repository YAML Test Build (#57073) (#57101) 

A few relatively obvious issues here:

* We cannot run the different IT runs (large blob setting one and normal integ run) concurrently
* We need to set the dependency tasks up correctly for the large blob run so that it works in isolation
* We can't use the `localAddress` for the location header of the resumable upload
(this breaks in YAML tests because GCS is using a loopback port forward for the initial request and the
local address will be chosen as the actual Docker container host)

Closes #57026
This commit is contained in:
Armin Braun 2020-05-25 11:10:39 +02:00 committed by GitHub
parent 28920a45f1
commit a4eb3edf46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/repository-gcs/qa/google-cloud-storage/build.gradle
View File

@ -128,7 +128,7 @@ integTest.mustRunAfter(thirdPartyTest)
* an additional test that forces the large blob threshold to be small to exercise the resumable upload path. * an additional test that forces the large blob threshold to be small to exercise the resumable upload path.
*/ */
task largeBlobIntegTest(type: RestIntegTestTask) { task largeBlobIntegTest(type: RestIntegTestTask) {
mustRunAfter(thirdPartyTest) mustRunAfter(thirdPartyTest, integTest)
} }
check.dependsOn integTest check.dependsOn integTest
@ -159,6 +159,7 @@ final Closure testClustersConfiguration = {
if (useFixture) { if (useFixture) {
tasks.integTest.dependsOn createServiceAccountFile tasks.integTest.dependsOn createServiceAccountFile
tasks.largeBlobIntegTest.dependsOn createServiceAccountFile
/* Use a closure on the string to delay evaluation until tests are executed */ /* Use a closure on the string to delay evaluation until tests are executed */
setting 'gcs.client.integration_test.endpoint', { "${-> fixtureAddress('gcs-fixture')}" }, IGNORE_VALUE setting 'gcs.client.integration_test.endpoint', { "${-> fixtureAddress('gcs-fixture')}" }, IGNORE_VALUE
setting 'gcs.client.integration_test.token_uri', { "${-> fixtureAddress('gcs-fixture')}/o/oauth2/token" }, IGNORE_VALUE setting 'gcs.client.integration_test.token_uri', { "${-> fixtureAddress('gcs-fixture')}/o/oauth2/token" }, IGNORE_VALUE

5
test/fixtures/gcs-fixture/src/main/java/fixture/gcs/GoogleCloudStorageHttpHandler.java vendored
View File

@ -31,7 +31,6 @@ import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.bytes.CompositeBytesReference; import org.elasticsearch.common.bytes.CompositeBytesReference;
import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.io.Streams;
import org.elasticsearch.common.network.InetAddresses;
import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.regex.Regex;
import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.rest.RestUtils; import org.elasticsearch.rest.RestUtils;
@ -40,7 +39,6 @@ import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.InetSocketAddress;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -259,8 +257,7 @@ public class GoogleCloudStorageHttpHandler implements HttpHandler {
} }
private String httpServerUrl(final HttpExchange exchange) { private String httpServerUrl(final HttpExchange exchange) {
final InetSocketAddress address = exchange.getLocalAddress(); return "http://" + exchange.getRequestHeaders().get("HOST").get(0);
return "http://" + InetAddresses.toUriString(address.getAddress()) + ":" + address.getPort();
} }
private static final Pattern NAME_PATTERN = Pattern.compile("\"name\":\"([^\"]*)\""); private static final Pattern NAME_PATTERN = Pattern.compile("\"name\":\"([^\"]*)\"");