Fix #6773 consuming the request in all cases to properly release resources

Author: freynaud

java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java

@@ -22,6 +22,7 @@
 import static org.openqa.grid.common.RegistrationRequest.REMOTE_HOST;
 import static org.openqa.grid.common.RegistrationRequest.SELENIUM_PROTOCOL;
 
+import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -501,10 +502,11 @@ public JSONObject getStatus() throws GridException {
     HttpHost host = new HttpHost(getRemoteHost().getHost(), getRemoteHost().getPort());
     HttpResponse response;
     String existingName = Thread.currentThread().getName();
-
+    HttpEntity entity = null;
     try {
       Thread.currentThread().setName("Probing status of " + url);
       response = client.execute(host, r);
+      entity = response.getEntity();
       int code = response.getStatusLine().getStatusCode();
 
       if (code == 200) {
@@ -529,6 +531,12 @@ public JSONObject getStatus() throws GridException {
       throw new GridException(e.getMessage(), e);
     } finally {
       Thread.currentThread().setName(existingName);
+      try { //Added by jojo to release connection thoroughly
+          EntityUtils.consume(entity);
+          } catch (IOException e) {
+            log.info("Exception thrown when consume entity");
+          }
+
     }
   }
 

java/server/src/org/openqa/grid/internal/TestSession.java

@@ -226,58 +226,60 @@ public String forward(SeleniumBasedRequest request, HttpServletResponse response
 
       HttpResponse proxyResponse = sendRequestToNode(proxyRequest);
       lastActivity = timeSource.currentTimeInMillis();
-
-      final int statusCode = proxyResponse.getStatusLine().getStatusCode();
-      response.setStatus(statusCode);
-      processResponseHeaders(request, response, slot.getRemoteURL(), proxyResponse);
-
-      byte[] consumedNewWebDriverSessionBody = null;
-      if (statusCode != HttpServletResponse.SC_INTERNAL_SERVER_ERROR &&
-          statusCode != HttpServletResponse.SC_NOT_FOUND) {
-        consumedNewWebDriverSessionBody = updateHubIfNewWebDriverSession(request, proxyResponse);
-      }
-      if (newSessionRequest && statusCode == HttpServletResponse.SC_INTERNAL_SERVER_ERROR) {
-        removeIncompleteNewSessionRequest();
-      }
-      if (statusCode == HttpServletResponse.SC_NOT_FOUND) {
-        removeSessionBrowserTimeout();
-      }
-
       HttpEntity responseBody = proxyResponse.getEntity();
-      byte[] contentBeingForwarded = null;
-      if (responseBody != null) {
-        try {
-          InputStream in;
-          if (consumedNewWebDriverSessionBody == null) {
-            in = responseBody.getContent();
-            if (request.getRequestType() == RequestType.START_SESSION
-                && request instanceof LegacySeleniumRequest) {
-              res = getResponseUtf8Content(in);
-
-              updateHubNewSeleniumSession(res);
+      try {
+        final int statusCode = proxyResponse.getStatusLine().getStatusCode();
+        response.setStatus(statusCode);
+        processResponseHeaders(request, response, slot.getRemoteURL(), proxyResponse);
+
+        byte[] consumedNewWebDriverSessionBody = null;
+        if (statusCode != HttpServletResponse.SC_INTERNAL_SERVER_ERROR &&
+            statusCode != HttpServletResponse.SC_NOT_FOUND) {
+          consumedNewWebDriverSessionBody = updateHubIfNewWebDriverSession(request, proxyResponse);
+        }
+        if (newSessionRequest && statusCode == HttpServletResponse.SC_INTERNAL_SERVER_ERROR) {
+          removeIncompleteNewSessionRequest();
+        }
+        if (statusCode == HttpServletResponse.SC_NOT_FOUND) {
+          removeSessionBrowserTimeout();
+        }
 
-              in = new ByteArrayInputStream(res.getBytes("UTF-8"));
+        byte[] contentBeingForwarded = null;
+        if (responseBody != null) {
+          try {
+            InputStream in;
+            if (consumedNewWebDriverSessionBody == null) {
+              in = responseBody.getContent();
+              if (request.getRequestType() == RequestType.START_SESSION
+                  && request instanceof LegacySeleniumRequest) {
+                res = getResponseUtf8Content(in);
+
+                updateHubNewSeleniumSession(res);
+
+                in = new ByteArrayInputStream(res.getBytes("UTF-8"));
+              }
+            } else {
+              in = new ByteArrayInputStream(consumedNewWebDriverSessionBody);
             }
-          } else {
-            in = new ByteArrayInputStream(consumedNewWebDriverSessionBody);
-          }
 
-          final byte[] bytes = drainInputStream(in);
-          writeRawBody(response, bytes);
+            final byte[] bytes = drainInputStream(in);
+            writeRawBody(response, bytes);
 
-          contentBeingForwarded = bytes;
-        } finally {
-          EntityUtils.consume(responseBody);
-        }
+          } finally {
+            EntityUtils.consume(responseBody);
+          }
 
-      }
+        }
 
-      if (slot.getProxy() instanceof CommandListener) {
-        SeleniumBasedResponse wrappedResponse = new SeleniumBasedResponse(response);
-        wrappedResponse.setForwardedContent(contentBeingForwarded);
-        ((CommandListener) slot.getProxy()).afterCommand(this, request, wrappedResponse);
+        if (slot.getProxy() instanceof CommandListener) {
+          SeleniumBasedResponse wrappedResponse = new SeleniumBasedResponse(response);
+          wrappedResponse.setForwardedContent(contentBeingForwarded);
+          ((CommandListener) slot.getProxy()).afterCommand(this, request, wrappedResponse);
+        }
+        response.flushBuffer();
+      } finally {
+        EntityUtils.consume(responseBody);
       }
-
       response.flushBuffer();
 
       return res;
@@ -547,17 +549,24 @@ public boolean sendDeleteSessionRequest() {
     }
 
     HttpHost host = new HttpHost(remoteURL.getHost(), remoteURL.getPort());
-
+    HttpEntity responseBody = null;
     boolean ok;
     try {
       HttpClient client = getClient();
       HttpResponse response = client.execute(host, request);
+      responseBody = response.getEntity();
       int code = response.getStatusLine().getStatusCode();
       ok = (code >= 200) && (code <= 299);
     } catch (Throwable e) {
       ok = false;
       // corrupted or the something else already sent the DELETE.
       log.severe("Error releasing. Server corrupted ?");
+    }finally{
+        try {
+            EntityUtils.consume(responseBody);
+         } catch (IOException e) {
+          log.warning("Consuming the response body when DELETE to the node" + e.getMessage());
+        }
     }
     return ok;
   }