mirror of https://github.com/apache/druid.git
Merge pull request #918 from metamx/fix-broker-timeouts
fix query timeouts not being raised by broker
This commit is contained in:
commit
646e184ca6
|
@ -159,15 +159,20 @@ public class DirectDruidClient<T> implements QueryRunner<T>
|
||||||
byteCount += response.getContent().readableBytes();
|
byteCount += response.getContent().readableBytes();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final Map<String, Object> responseContext = objectMapper.readValue(
|
final String responseContext = response.headers().get("X-Druid-Response-Context");
|
||||||
response.headers().get("X-Druid-Response-Context"), new TypeReference<Map<String, Object>>()
|
// context may be null in case of error or query timeout
|
||||||
|
if (responseContext != null) {
|
||||||
|
context.putAll(
|
||||||
|
objectMapper.<Map<String, Object>>readValue(
|
||||||
|
responseContext, new TypeReference<Map<String, Object>>()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
)
|
||||||
);
|
);
|
||||||
context.putAll(responseContext);
|
}
|
||||||
}
|
}
|
||||||
catch (IOException e) {
|
catch (IOException e) {
|
||||||
e.printStackTrace();
|
log.error(e, "Unable to parse response context from url[%s]", url);
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.handleResponse(response);
|
return super.handleResponse(response);
|
||||||
|
|
Loading…
Reference in New Issue