Merge pull request #147 from shabtaisharon/networkPerformance

add connectionManager with 50 defualt connection per route and 100 co…

Author: rpmoore

ds3-sdk/src/main/java/com/spectralogic/ds3client/NetworkClientImpl.java

@@ -26,17 +26,20 @@
 import com.spectralogic.ds3client.utils.DateFormatter;
 import com.spectralogic.ds3client.utils.SSLSetupException;
 import com.spectralogic.ds3client.utils.Signature;
-
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.ssl.*;
+import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContexts;
+import org.apache.http.conn.ssl.TrustStrategy;
 import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicHttpEntityEnclosingRequest;
 import org.apache.http.message.BasicHttpRequest;
 import org.slf4j.Logger;
@@ -46,11 +49,13 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.AssertionError;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
-import java.security.*;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Collection;
@@ -67,25 +72,44 @@ public class NetworkClientImpl implements NetworkClient {
     final static private String CONTENT_SHA512 = "Content-SHA512";
     final static private String CONTENT_CRC32 = "Content-CRC32";
     final static private String CONTENT_CRC32C = "Content-CRC32C";
+    final static private int MAX_CONNECTION_PER_ROUTE = 50;
+    final static private int MAX_CONNECTION_TOTAL = 100;
 
     final private ConnectionDetails connectionDetails;
 
     final private CloseableHttpClient client;
+    final private HttpHost host;
 
     public NetworkClientImpl(final ConnectionDetails connectionDetails) {
         if (connectionDetails == null) throw new AssertionError("ConnectionDetails cannot be null");
-        this.connectionDetails = connectionDetails;
-        this.client = createDefaultClient(connectionDetails);
+        try {
+            this.connectionDetails = connectionDetails;
+            this.host = buildHost(connectionDetails);
+            this.client = createDefaultClient(connectionDetails, host);
+        } catch (final MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
     }
 
+
     public NetworkClientImpl(final ConnectionDetails connectionDetails, final CloseableHttpClient client) {
         if (connectionDetails == null) throw new AssertionError("ConnectionDetails cannot be null");
         if (client == null) throw new AssertionError("CloseableHttpClient cannot be null");
-        this.connectionDetails = connectionDetails;
-        this.client = client;
+        try {
+            this.connectionDetails = connectionDetails;
+            this.host = buildHost(connectionDetails);
+            this.client = client;
+        } catch (final MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
     }
 
-    private static CloseableHttpClient createDefaultClient(final ConnectionDetails connectionDetails) {
+
+    private static CloseableHttpClient createDefaultClient(final ConnectionDetails connectionDetails, final HttpHost host) {
+        final PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
+        connectionManager.setDefaultMaxPerRoute(MAX_CONNECTION_PER_ROUTE);
+        connectionManager.setMaxTotal(MAX_CONNECTION_TOTAL);
+
         if (connectionDetails.isHttps() && !connectionDetails.isCertificateVerification()) {
             try {
 
@@ -97,15 +121,29 @@ public boolean isTrusted(final X509Certificate[] chain, final String authType) t
                 }).useTLS().build();
 
                 final SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new AllowAllHostnameVerifier());
-                return HttpClients.custom().setSSLSocketFactory(
+                return HttpClients.custom()
+                        .setConnectionManager(connectionManager)
+                        .setSSLSocketFactory(
                         sslsf).build();
 
             } catch (final NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
                 throw new SSLSetupException(e);
             }
         }
         else {
-            return HttpClients.createDefault();
+            return HttpClients.custom()
+                    .setConnectionManager(connectionManager)
+                    .build();
+        }
+    }
+
+    private static HttpHost buildHost(final ConnectionDetails connectionDetails) throws MalformedURLException {
+        final URI proxyUri = connectionDetails.getProxy();
+        if (proxyUri != null) {
+            return new HttpHost(proxyUri.getHost(), proxyUri.getPort(), proxyUri.getScheme());
+        } else {
+            final URL url = NetUtils.buildUrl(connectionDetails, "/");
+            return new HttpHost(url.getHost(), NetUtils.getPort(url), url.getProtocol());
         }
     }
 
@@ -116,12 +154,13 @@ public ConnectionDetails getConnectionDetails() {
 
     @Override
     public WebResponse getResponse(final Ds3Request request) throws IOException, SignatureException {
-        try (final RequestExecutor requestExecutor = new RequestExecutor(this.client, request)) {
+        try (final RequestExecutor requestExecutor = new RequestExecutor(this.client, host, request)) {
             int redirectCount = 0;
             do {
                 final CloseableHttpResponse response = requestExecutor.execute();
                 if (response.getStatusLine().getStatusCode() == HttpStatus.SC_TEMPORARY_REDIRECT) {
                     redirectCount++;
+                    response.close();
                     LOG.info("Performing retry - attempt: " + redirectCount);
                 }
                 else {
@@ -147,10 +186,10 @@ private class RequestExecutor implements Closeable {
         private final Checksum.Type checksumType;
         private final CloseableHttpClient client;
 
-        public RequestExecutor(final CloseableHttpClient client, final Ds3Request ds3Request) throws IOException {
+        public RequestExecutor(final CloseableHttpClient client, final HttpHost host, final Ds3Request ds3Request) throws IOException {
             this.client = client;
             this.ds3Request = ds3Request;
-            this.host = this.buildHost();
+            this.host = host;
             this.content = ds3Request.getStream();
             if (this.content != null && !this.content.markSupported()) {
                 throw new RequiresMarkSupportedException();
@@ -171,16 +210,6 @@ public CloseableHttpResponse execute() throws IOException, SignatureException {
             return client.execute(this.host, httpRequest, this.getContext());
         }
 
-        private HttpHost buildHost() throws MalformedURLException {
-            final URI proxyUri = NetworkClientImpl.this.connectionDetails.getProxy();
-            if (proxyUri != null) {
-                return new HttpHost(proxyUri.getHost(), proxyUri.getPort(), proxyUri.getScheme());
-            } else {
-                final URL url = NetUtils.buildUrl(NetworkClientImpl.this.connectionDetails, "/");
-                return new HttpHost(url.getHost(), NetUtils.getPort(url), url.getProtocol());
-            }
-        }
-
         private HttpRequest buildHttpRequest() throws IOException {
             final String verb = this.ds3Request.getVerb().toString();
             final String path = this.buildPath();