Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Azure Mock Issues #49377

Merged
merged 1 commit into from
Nov 20, 2019
Merged

Fix Azure Mock Issues #49377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions ...ure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import fixture.azure.AzureHttpHandler;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.settings.MockSecureSettings;
import org.elasticsearch.common.settings.Settings;
Expand All @@ -41,7 +40,6 @@
import java.util.Collections;
import java.util.Map;

@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/48978")
@SuppressForbidden(reason = "this test uses a HttpServer to emulate an Azure endpoint")
public class AzureBlobStoreRepositoryTests extends ESMockAPIBasedRepositoryIntegTestCase {

Expand Down Expand Up @@ -140,9 +138,12 @@ private static class AzureErroneousHttpHandler extends ErroneousHttpHandler {

@Override
protected void handleAsError(final HttpExchange exchange) throws IOException {
drainInputStream(exchange.getRequestBody());
AzureHttpHandler.sendError(exchange, randomFrom(RestStatus.INTERNAL_SERVER_ERROR, RestStatus.SERVICE_UNAVAILABLE));
exchange.close();
try {
drainInputStream(exchange.getRequestBody());
AzureHttpHandler.sendError(exchange, randomFrom(RestStatus.INTERNAL_SERVER_ERROR, RestStatus.SERVICE_UNAVAILABLE));
} finally {
exchange.close();
}
}

@Override
Expand Down
10 changes: 4 additions & 6 deletions test/fixtures/azure-fixture/src/main/java/fixture/azure/AzureHttpHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void handle(final HttpExchange exchange) throws IOException {

} else if (Regex.simpleMatch("PUT /" + container + "/*", request)) {
// PUT Blob (see https://docs.microsoft.com/en-us/rest/api/storageservices/put-blob)
final String ifNoneMatch = exchange.getResponseHeaders().getFirst("If-None-Match");
final String ifNoneMatch = exchange.getRequestHeaders().getFirst("If-None-Match");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

if ("*".equals(ifNoneMatch)) {
if (blobs.putIfAbsent(exchange.getRequestURI().getPath(), Streams.readFully(exchange.getRequestBody())) != null) {
sendError(exchange, RestStatus.CONFLICT);
Expand Down Expand Up @@ -214,12 +214,10 @@ public static void sendError(final HttpExchange exchange, final RestStatus statu
}

final String errorCode = toAzureErrorCode(status);
if (errorCode != null) {
// see Constants.HeaderConstants.ERROR_CODE
headers.add("x-ms-error-code", errorCode);
}
// see Constants.HeaderConstants.ERROR_CODE
headers.add("x-ms-error-code", errorCode);

if (errorCode == null || "HEAD".equals(exchange.getRequestMethod())) {
if ("HEAD".equals(exchange.getRequestMethod())) {
exchange.sendResponseHeaders(status.getStatus(), -1L);
} else {
final byte[] response = ("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Error><Code>" + errorCode + "</Code><Message>"
Expand Down
15 changes: 9 additions & 6 deletions .../java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,12 @@ public void handle(final HttpExchange exchange) throws IOException {
}

protected void handleAsError(final HttpExchange exchange) throws IOException {
drainInputStream(exchange.getRequestBody());
exchange.sendResponseHeaders(HttpStatus.SC_INTERNAL_SERVER_ERROR, -1);
exchange.close();
try {
drainInputStream(exchange.getRequestBody());
exchange.sendResponseHeaders(HttpStatus.SC_INTERNAL_SERVER_ERROR, -1);
} finally {
exchange.close();
}
}

protected abstract String requestUniqueId(HttpExchange exchange);
Expand All @@ -214,10 +217,10 @@ private static HttpHandler wrap(final HttpHandler handler, final Logger logger)
return exchange -> {
try {
handler.handle(exchange);
} catch (final Exception e) {
} catch (Throwable t) {
logger.error(() -> new ParameterizedMessage("Exception when handling request {} {} {}",
exchange.getRemoteAddress(), exchange.getRequestMethod(), exchange.getRequestURI()), e);
throw e;
exchange.getRemoteAddress(), exchange.getRequestMethod(), exchange.getRequestURI()), t);
throw t;
}
};
}
Expand Down