honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-25 06:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

include response body in ElasticsearchResponseException error message

Browse Source
This commit is contained in:
javanna 2016-05-20 11:03:43 +02:00 committed by Luca Cavanna
parent eae914ae8e
commit c70e08c393
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
client/src/main/java/org/elasticsearch/client/ElasticsearchResponseException.java
View File

@ -19,41 +19,37 @@
package org.elasticsearch.client;
import org.apache.http.HttpHost;
import org.apache.http.RequestLine;
import org.apache.http.StatusLine;
import org.apache.http.util.EntityUtils;
import java.io.IOException;
/**
* Exception thrown when an elasticsearch node responds to a request with a status code that indicates an error
* Exception thrown when an elasticsearch node responds to a request with a status code that indicates an error.
* Note that the response body gets passed in as a string and read eagerly, which means that the ElasticsearchResponse object
* is expected to be closed and available only to read metadata like status line, request line, response headers.
*/
public class ElasticsearchResponseException extends IOException {
private ElasticsearchResponse elasticsearchResponse;
private final String responseBody;
public ElasticsearchResponseException(ElasticsearchResponse elasticsearchResponse) throws IOException {
super(buildMessage(elasticsearchResponse.getRequestLine(), elasticsearchResponse.getHost(), elasticsearchResponse.getStatusLine()));
public ElasticsearchResponseException(ElasticsearchResponse elasticsearchResponse, String responseBody) throws IOException {
super(buildMessage(elasticsearchResponse,responseBody));
this.elasticsearchResponse = elasticsearchResponse;
try {
if (elasticsearchResponse.getEntity() == null) {
this.responseBody = null;
} else {
this.responseBody = EntityUtils.toString(elasticsearchResponse.getEntity());
}
} finally {
elasticsearchResponse.close();
}
this.responseBody = responseBody;
}
private static String buildMessage(RequestLine requestLine, HttpHost host, StatusLine statusLine) {
return requestLine.getMethod() + " " + host + requestLine.getUri() + ": " + statusLine.toString();
private static String buildMessage(ElasticsearchResponse response, String responseBody) {
String message = response.getRequestLine().getMethod() + " " + response.getHost() + response.getRequestLine().getUri()
+ ": " + response.getStatusLine().toString();
if (responseBody != null) {
message += "\n" + responseBody;
}
return message;
}
/**
* Returns the {@link ElasticsearchResponse} that caused this exception to be thrown
* Returns the {@link ElasticsearchResponse} that caused this exception to be thrown.
* Expected to be used only to read metadata like status line, request line, response headers. The response body should
* be retrieved using {@link #getResponseBody()}
*/
public ElasticsearchResponse getElasticsearchResponse() {
return elasticsearchResponse;

14
client/src/main/java/org/elasticsearch/client/RestClient.java
View File

@ -37,6 +37,7 @@ import org.apache.http.entity.ContentType;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.util.EntityUtils;
import java.io.Closeable;
import java.io.IOException;
@ -127,7 +128,18 @@ public final class RestClient implements Closeable {
return elasticsearchResponse;
} else {
RequestLogger.log(logger, "request failed", request, connection.getHost(), response);
ElasticsearchResponseException elasticsearchResponseException = new ElasticsearchResponseException(elasticsearchResponse);
String responseBody;
try {
if (elasticsearchResponse.getEntity() == null) {
responseBody = null;
} else {
responseBody = EntityUtils.toString(elasticsearchResponse.getEntity());
}
} finally {
elasticsearchResponse.close();
}
ElasticsearchResponseException elasticsearchResponseException = new ElasticsearchResponseException(
elasticsearchResponse, responseBody);
lastSeenException = addSuppressedException(lastSeenException, elasticsearchResponseException);
//clients don't retry on 500 because elasticsearch still misuses it instead of 400 in some places
if (statusCode == 502 || statusCode == 503 || statusCode == 504) {