Merge pull request #170 from jofriedm-msft/dev

Connection pooling fixes

Author: pemari-msft

ChangeLog.txt

@@ -1,5 +1,8 @@
 2017.XX.XX Version X.X.X
  * Fixed a bug where the tranactional MD5 check would fail when downloading a range of blob or file and the recovery action is performed on a subsection of the range.
+ * Fixed leaking connections for table requests.
+ * Fixed a bug where retries happened immediately when experiencing a network exception uploading data or getting the response.
+ * Fixed a bug where the response stream was not being closed on nonretryable exceptions.
 
 2017.05.23 Version 5.2.0
  * Fixed Exists() calls on Shares and Directories to now populate metadata. This was already being done for Files.

microsoft-azure-storage/src/com/microsoft/azure/storage/RequestResult.java

@@ -173,6 +173,13 @@ public String getStatusMessage() {
      * @return A <code>java.util.Date</code> object which contains the stop date.
      */
     public Date getStopDate() {
+        if (this.stopDate == null)
+        {
+            // stop date was not initialized, most likely due to a network exception
+            // if this is null, retries are immediate
+            this.stopDate = new Date();
+        }
+
         return this.stopDate;
     }
 

microsoft-azure-storage/src/com/microsoft/azure/storage/core/ExecutionEngine.java

@@ -115,13 +115,10 @@ public static <CLIENT_TYPE, PARENT_TYPE, RESULT_TYPE> RESULT_TYPE executeWithRet
                 currResult.setStartDate(new Date());
 
                 Logger.info(opContext, LogConstants.GET_RESPONSE);
-                try {
-                    currResult.setStatusCode(request.getResponseCode());
-                    currResult.setStatusMessage(request.getResponseMessage());
-                }
-                finally {
-                    currResult.setStopDate(new Date());
-                }
+
+                currResult.setStatusCode(request.getResponseCode());
+                currResult.setStatusMessage(request.getResponseMessage());
+                currResult.setStopDate(new Date());
 
                 currResult.setServiceRequestID(BaseResponse.getRequestId(request));
                 currResult.setEtag(BaseResponse.getEtag(request));
@@ -168,6 +165,7 @@ public static <CLIENT_TYPE, PARENT_TYPE, RESULT_TYPE> RESULT_TYPE executeWithRet
                             }
                         }
                     }
+
                     Logger.info(opContext, LogConstants.COMPLETE);
 
                     return result;

microsoft-azure-storage/src/com/microsoft/azure/storage/core/Utility.java

@@ -657,9 +657,7 @@ public static JsonGenerator getJsonGenerator(OutputStream outStream) throws IOEx
      */
     public static JsonParser getJsonParser(final String jsonString) throws JsonParseException, IOException {
         JsonParser parser = jsonFactory.createParser(jsonString);
-
-        // allows handling of infinity, -infinity, and NaN for Doubles
-        return parser.enable(JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS);
+        return setupJsonParser(parser);
     }
 
     /**
@@ -674,6 +672,20 @@ public static JsonParser getJsonParser(final String jsonString) throws JsonParse
      */
     public static JsonParser getJsonParser(final InputStream inStream) throws JsonParseException, IOException {
         JsonParser parser = jsonFactory.createParser(inStream);
+        return setupJsonParser(parser);
+    }
+
+    /**
+     * Returns a <code>JsonParser</code> This JsonParser will allow non-numeric numbers.
+     * @param parser
+     *      A <code>JsonParser</code> to setup.
+     * @return
+     *      A <code>JsonParser</code> with settings configured.
+     */
+    private static JsonParser setupJsonParser(final JsonParser parser) {
+        // IMPORTANT: DO NOT REMOVE!
+        // don't close the stream and allow it to be drained completely in ExecutionEngine to improve socket reuse
+        parser.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);
 
         // allows handling of infinity, -infinity, and NaN for Doubles
         return parser.enable(JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS);