sullis commented on code in PR #13222:
URL: https://github.com/apache/pinot/pull/13222#discussion_r1667726933
##########
pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/PinotRunningQueryResource.java:
##########
@@ -112,50 +116,46 @@ public String cancelQuery(
@ApiParam(value = "Timeout for servers to respond the cancel request")
@QueryParam("timeoutMs")
@DefaultValue("3000") int timeoutMs,
@ApiParam(value = "Return verbose responses for troubleshooting")
@QueryParam("verbose") @DefaultValue("false")
- boolean verbose, @Context HttpHeaders httpHeaders) {
+ boolean verbose, @Context HttpHeaders httpHeaders) {
InstanceConfig broker =
_pinotHelixResourceManager.getHelixInstanceConfig(brokerId);
if (broker == null) {
throw new WebApplicationException(
Response.status(Response.Status.BAD_REQUEST).entity("Unknown broker:
" + brokerId).build());
}
try {
- RequestConfig defaultRequestConfig = RequestConfig.custom()
- .setConnectionRequestTimeout(timeoutMs)
- .setSocketTimeout(timeoutMs).build();
+ Timeout timeout = Timeout.of(timeoutMs, TimeUnit.MILLISECONDS);
+ RequestConfig defaultRequestConfig =
+
RequestConfig.custom().setConnectionRequestTimeout(timeout).setResponseTimeout(timeout).build();
- CloseableHttpClient client =
HttpClients.custom().setConnectionManager(_httpConnMgr)
- .setDefaultRequestConfig(defaultRequestConfig).build();
+ CloseableHttpClient client =
+
HttpClients.custom().setConnectionManager(_httpConnMgr).setDefaultRequestConfig(defaultRequestConfig).build();
String protocol = _controllerConf.getControllerBrokerProtocol();
int portOverride = _controllerConf.getControllerBrokerPortOverride();
int port = portOverride > 0 ? portOverride :
Integer.parseInt(broker.getPort());
HttpDelete deleteMethod = new HttpDelete(
String.format("%s://%s:%d/query/%d?verbose=%b", protocol,
broker.getHostName(), port, queryId, verbose));
- try {
- Map<String, String> requestHeaders = createRequestHeaders(httpHeaders);
- requestHeaders.forEach(deleteMethod::setHeader);
- CloseableHttpResponse response = client.execute(deleteMethod);
- int status = response.getStatusLine().getStatusCode();
- String responseContent = EntityUtils.toString(response.getEntity());
- if (status == 200) {
- return responseContent;
- }
- if (status == 404) {
- throw new
WebApplicationException(Response.status(Response.Status.NOT_FOUND)
- .entity(String.format("Query: %s not found on the broker: %s",
queryId, brokerId)).build());
- }
- throw new
WebApplicationException(Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(String
- .format("Failed to cancel query: %s on the broker: %s with
unexpected status=%d and resp='%s'", queryId,
- brokerId, status, responseContent)).build());
- } finally {
- deleteMethod.releaseConnection();
+ Map<String, String> requestHeaders = createRequestHeaders(httpHeaders);
+ requestHeaders.forEach(deleteMethod::setHeader);
+ CloseableHttpResponse response = client.execute(deleteMethod);
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
