honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-30 20:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly fail reindex-from-remote if can't detect content type

Browse Source
This commit is contained in:
Nik Everett 2016-12-19 12:28:31 -05:00
parent 87d8764a32
commit 2d71ced221
1 changed files with 25 additions and 13 deletions

38
modules/reindex/src/main/java/org/elasticsearch/index/reindex/remote/RemoteScrollableHitSource.java

@ -166,7 +166,17 @@ public class RemoteScrollableHitSource extends ScrollableHitSource {
//auto-detect as a fallback
xContentType = XContentFactory.xContentType(content);
}
try(XContentParser xContentParser = xContentType.xContent().createParser(content)) {
if (xContentType == null) {
try {
throw new ElasticsearchException(
"Can't detect content type for response: " + bodyMessage(response.getEntity()));
} catch (IOException e) {
ElasticsearchException ee = new ElasticsearchException("Error extracting body from response");
ee.addSuppressed(e);
throw ee;
}
}
try (XContentParser xContentParser = xContentType.xContent().createParser(content)) {
parsedResponse = parser.apply(xContentParser, () -> ParseFieldMatcher.STRICT);
}
} catch (IOException e) {
@ -220,18 +230,20 @@ public class RemoteScrollableHitSource extends ScrollableHitSource {
messagePrefix = "Couldn't extract status [" + statusCode + "]. ";
status = RestStatus.INTERNAL_SERVER_ERROR;
}
String message;
if (entity == null) {
message = messagePrefix + "No error body.";
} else {
try {
message = messagePrefix + "body=" + EntityUtils.toString(entity);
} catch (IOException ioe) {
ElasticsearchStatusException e = new ElasticsearchStatusException(messagePrefix + "Failed to extract body.", status, cause);
e.addSuppressed(ioe);
return e;
}
try {
return new ElasticsearchStatusException(messagePrefix + bodyMessage(entity), status, cause);
} catch (IOException ioe) {
ElasticsearchStatusException e = new ElasticsearchStatusException(messagePrefix + "Failed to extract body.", status, cause);
e.addSuppressed(ioe);
return e;
}
}
static String bodyMessage(@Nullable HttpEntity entity) throws IOException {
if (entity == null) {
return "No error body.";
} else {
return "body=" + EntityUtils.toString(entity);
}
return new ElasticsearchStatusException(message, status, cause);
}
}