Merge pull request #2412 from TianoMS/tiano-d2

Dispose response messages when we retry sending requests.

Author: markcowl

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Handlers/RetryHandler.cs

@@ -14,15 +14,15 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Handlers
 {
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
-    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities;
     using System;
     using System.Net;
     using System.Net.Http;
     using System.Threading;
     using System.Threading.Tasks;
-
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
+    using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities;
+    
     /// <summary>
     /// A basic retry handler.
     /// </summary>
@@ -56,20 +56,21 @@ public class RetryHandler : DelegatingHandler
         protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
             HttpResponseMessage response = null;
-            for (int attempt = 0; attempt < RetryHandler.MaxAttempts; ++attempt)
+
+            for (int attempt = 1; attempt <= RetryHandler.MaxAttempts; ++attempt)
             {
                 try
                 {
                     response = await base
                         .SendAsync(request: request, cancellationToken: cancellationToken)
                         .ConfigureAwait(continueOnCapturedContext: false);
-
+                    
                     if (attempt == RetryHandler.MaxAttempts ||
                         (!response.StatusCode.IsServerFailureRequest() &&
                          response.StatusCode != HttpStatusCode.RequestTimeout &&
                          response.StatusCode != HttpStatusCodeExt.TooManyRequests))
                     {
-                        return response;
+                        break;
                     }
                 }
                 catch (Exception ex)
@@ -80,6 +81,11 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                     }
                 }
 
+                if (response != null)
+                {
+                    response.Dispose();
+                }
+
                 await Task.Delay(delay: RetryHandler.GetDelay(attempt), cancellationToken: cancellationToken)
                     .ConfigureAwait(continueOnCapturedContext: false);
             }

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Properties/Resources.Designer.cs

@@ -396,4 +396,7 @@
   <data name="UpdatedResourceGroup" xml:space="preserve">
     <value>Updated resource group '{0}' in location '{1}'</value>
   </data>
+  <data name="OperationFailedWithTimeOut" xml:space="preserve">
+    <value>Operation failed because a request timed out.</value>
+  </data>
 </root>

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Properties/Resources.resx

@@ -14,17 +14,18 @@
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.RestClients
 {
+    using System;
+    using System.Net.Http;
+    using System.Text;
+    using System.Threading;
+    using System.Threading.Tasks;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.ErrorResponses;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions;
     using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
-    using System;
-    using System.Net.Http;
-    using System.Text;
-    using System.Threading;
-    using System.Threading.Tasks;
+    using ProjectResources = Microsoft.Azure.Commands.ResourceManager.Cmdlets.Properties.Resources;
 
     /// <summary>
     /// A base class for Azure clients.
@@ -219,27 +220,39 @@ protected async Task<HttpResponseMessage> SendRequestAsync(HttpRequestMessage re
         {
             using (var httpClient = this.httpClientHelper.CreateHttpClient())
             {
-                var response = await httpClient
-                    .SendAsync(request: request, cancellationToken: cancellationToken)
-                    .ConfigureAwait(continueOnCapturedContext: false);
-
-                if (!response.StatusCode.IsSuccessfulRequest())
+                try
                 {
-                    var errorResponse = await ResourceManagerRestClientBase
-                        .TryReadErrorResponseMessage(response, rewindContentStream: true)
+                    var response = await httpClient
+                        .SendAsync(request: request, cancellationToken: cancellationToken)
                         .ConfigureAwait(continueOnCapturedContext: false);
 
-                    var message = await ResourceManagerRestClientBase
-                        .GetErrorMessage(request: request, response: response, errorResponse: errorResponse)
-                        .ConfigureAwait(continueOnCapturedContext: false);
+                    if (!response.StatusCode.IsSuccessfulRequest())
+                    {
+                        var errorResponse = await ResourceManagerRestClientBase
+                            .TryReadErrorResponseMessage(response, rewindContentStream: true)
+                            .ConfigureAwait(continueOnCapturedContext: false);
 
-                    throw new ErrorResponseMessageException(
-                        httpStatus: response.StatusCode,
-                        errorResponseMessage: errorResponse,
-                        errorMessage: message);
+                        var message = await ResourceManagerRestClientBase
+                            .GetErrorMessage(request: request, response: response, errorResponse: errorResponse)
+                            .ConfigureAwait(continueOnCapturedContext: false);
+
+                        throw new ErrorResponseMessageException(
+                            httpStatus: response.StatusCode,
+                            errorResponseMessage: errorResponse,
+                            errorMessage: message);
+                    }
+
+                    return response;
                 }
+                catch (Exception exception)
+                {
+                    if (exception is OperationCanceledException && !cancellationToken.IsCancellationRequested)
+                    {
+                        throw new Exception(ProjectResources.OperationFailedWithTimeOut);
+                    }
 
-                return response;
+                    throw;
+                }
             }
         }