aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java2
-rw-r--r--node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java14
2 files changed, 10 insertions, 6 deletions
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java
index 54b9898972a..21584aee18d 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/CoredumpHandler.java
@@ -7,6 +7,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
+import org.apache.http.util.EntityUtils;
import java.io.BufferedReader;
import java.io.IOException;
@@ -153,6 +154,7 @@ public class CoredumpHandler {
throw new RuntimeException("POST to " + post.getURI() + " failed with HTTP: " +
response.getStatusLine().getStatusCode() + " [" + result + "]");
}
+ EntityUtils.consume(response.getEntity());
logger.info("Successfully reported coredump " + documentId);
}
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java
index 0cda14ba397..15611c85b45 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java
@@ -190,12 +190,14 @@ public class Maintainer {
private static HttpClient createHttpClient(Duration timeout) {
int timeoutInMillis = (int) timeout.toMillis();
return HttpClientBuilder.create()
- .setDefaultRequestConfig(RequestConfig.custom()
- .setConnectTimeout(timeoutInMillis)
- .setConnectionRequestTimeout(timeoutInMillis)
- .setSocketTimeout(timeoutInMillis)
- .build())
- .build();
+ .setDefaultRequestConfig(RequestConfig.custom()
+ .setConnectTimeout(timeoutInMillis)
+ .setConnectionRequestTimeout(timeoutInMillis)
+ .setSocketTimeout(timeoutInMillis)
+ .build())
+ .setMaxConnTotal(100)
+ .setMaxConnPerRoute(10)
+ .build();
}
}