Merge pull request #73 from pemari-msft/master

vinaysh-msft · vinaysh-msft · commit 62c2b9024cbf · 2014-08-13T10:31:08.000-07:00
Storage Client Library - 4.2.1
diff --git a/Lib/Common/Blob/CloudBlockBlob.Common.cs b/Lib/Common/Blob/CloudBlockBlob.Common.cs
@@ -515,7 +515,11 @@ private void ParseQueryAndVerify(StorageUri address, StorageCredentials credenti
                 this.SnapshotTime = parsedSnapshot;
             }
 
-            this.ServiceClient = new CloudBlobClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials ?? parsedCredentials);
+            if (this.ServiceClient == null)
+            {
+                this.ServiceClient = new CloudBlobClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials ?? parsedCredentials);
+            }
+            
             this.Name = NavigationHelper.GetBlobName(this.Uri, this.ServiceClient.UsePathStyleUris);
         }
     }
diff --git a/Lib/Common/Blob/CloudPageBlob.Common.cs b/Lib/Common/Blob/CloudPageBlob.Common.cs
@@ -512,7 +512,11 @@ private void ParseQueryAndVerify(StorageUri address, StorageCredentials credenti
                 this.SnapshotTime = parsedSnapshot;
             }
 
-            this.ServiceClient = new CloudBlobClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials ?? parsedCredentials);
+            if (this.ServiceClient == null)
+            {
+                this.ServiceClient = new CloudBlobClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials ?? parsedCredentials);
+            }
+
             this.Name = NavigationHelper.GetBlobName(this.Uri, this.ServiceClient.UsePathStyleUris);
         }
     }
diff --git a/Lib/Common/File/CloudFile.Common.cs b/Lib/Common/File/CloudFile.Common.cs
@@ -262,7 +262,11 @@ public CloudFileDirectory Parent
         private void ParseQueryAndVerify(StorageUri address, StorageCredentials credentials)
         {
             this.attributes.StorageUri = address;
-            this.ServiceClient = new CloudFileClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials);
+            if (this.ServiceClient == null)
+            {
+                this.ServiceClient = new CloudFileClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials);
+            }
+            
             this.Name = NavigationHelper.GetFileName(this.Uri, this.ServiceClient.UsePathStyleUris);
         }
     }
diff --git a/Lib/Common/Shared/Protocol/Constants.cs b/Lib/Common/Shared/Protocol/Constants.cs
@@ -760,7 +760,7 @@ static HeaderConstants()
             /// <summary>
             /// Specifies the value to use for UserAgent header.
             /// </summary>
-            public const string UserAgentProductVersion = "4.2.0";
+            public const string UserAgentProductVersion = "4.2.1";
 
             /// <summary>
             /// Master Windows Azure Storage header prefix.
diff --git a/Lib/Common/StorageException.cs b/Lib/Common/StorageException.cs
@@ -252,7 +252,7 @@ private static StorageException CoreTranslate(Exception ex, RequestResult reqRes
             else if (ex is TimeoutException)
             {
                 reqResult.HttpStatusMessage = null;
-                reqResult.HttpStatusCode = (int)HttpStatusCode.Unused;
+                reqResult.HttpStatusCode = (int)HttpStatusCode.RequestTimeout;
                 reqResult.ExtendedErrorInformation = null;
                 return new StorageException(reqResult, ex.Message, ex);
             }
@@ -309,7 +309,7 @@ internal static StorageException TranslateDataServiceException(Exception ex, Req
             else if (ex is TimeoutException)
             {
                 reqResult.HttpStatusMessage = null;
-                reqResult.HttpStatusCode = (int)HttpStatusCode.Unused;
+                reqResult.HttpStatusCode = (int)HttpStatusCode.RequestTimeout;
                 reqResult.ExtendedErrorInformation = null;
                 return new StorageException(reqResult, ex.Message, ex);
             }
@@ -351,6 +351,13 @@ private static void PopulateRequestResult(RequestResult reqResult, HttpWebRespon
                 string tempDate = HttpWebUtility.TryGetHeader(response, "Date", null);
                 reqResult.RequestDate = string.IsNullOrEmpty(tempDate) ? DateTime.Now.ToString("R", CultureInfo.InvariantCulture) : tempDate;
                 reqResult.Etag = response.Headers[HttpResponseHeader.ETag];
+#endif
+            }
+
+            if (response.ContentLength > 0) 
+            {
+#if !WINDOWS_RT
+                reqResult.IngressBytes += response.ContentLength;
 #endif
             }
         }
diff --git a/Lib/WindowsDesktop/Properties/AssemblyInfo.cs b/Lib/WindowsDesktop/Properties/AssemblyInfo.cs
@@ -34,8 +34,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.2.1.0")]
+[assembly: AssemblyFileVersion("4.2.1.0")]
 
 #if SIGN
 [assembly: InternalsVisibleTo(
diff --git a/Lib/WindowsDesktop/WindowsAzure.Storage.nuspec b/Lib/WindowsDesktop/WindowsAzure.Storage.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WindowsAzure.Storage</id>
-    <version>4.2.0</version>
+    <version>4.2.1</version>
     <title>Windows Azure Storage</title>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
diff --git a/Lib/WindowsPhone/Properties/AssemblyInfo.cs b/Lib/WindowsPhone/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.2.1.0")]
+[assembly: AssemblyFileVersion("4.2.1.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
 
 #if SIGN
diff --git a/Lib/WindowsRuntime/Properties/AssemblyInfo.cs b/Lib/WindowsRuntime/Properties/AssemblyInfo.cs
@@ -25,8 +25,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.2.1.0")]
+[assembly: AssemblyFileVersion("4.2.1.0")]
 [assembly: ComVisible(false)]
 
 #if SIGN
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Microsoft Azure Storage SDK for .NET (4.2.0)
+# Microsoft Azure Storage SDK for .NET (4.2.1)
 
 The Microsoft Azure Storage SDK for .NET allows you to build Azure applications 
 that take advantage of scalable cloud computing resources.
diff --git a/Test/ClassLibraryCommon/Blob/BlobManglerUnitTests.cs b/Test/ClassLibraryCommon/Blob/BlobManglerUnitTests.cs
@@ -114,6 +114,19 @@ public void BlobIngressEgressCounters()
                 });
 
                 Assert.AreEqual(blob.Properties.Length, 98765 + 1024 + 1);
+
+                // Error Case
+                CloudBlockBlob nullBlob = container.GetBlockBlobReference("null");
+                OperationContext errorContext = new OperationContext();
+                try
+                {
+                    nullBlob.DownloadToStream(Stream.Null, null, new BlobRequestOptions() { RetryPolicy = new RetryPolicies.NoRetry() }, errorContext);
+                    Assert.Fail("Null blob, null stream, no download possible.");
+                }
+                catch (StorageException)
+                {
+                    Assert.IsTrue(errorContext.LastResult.IngressBytes > 0);
+                }
             }
             finally
             {
diff --git a/Test/ClassLibraryCommon/Blob/CloudBlobContainerTest.cs b/Test/ClassLibraryCommon/Blob/CloudBlobContainerTest.cs
@@ -2060,7 +2060,9 @@ public void CloudBlobContainerSetMetadataTask()
         [TestCategory(TenantTypeCategory.DevStore), TestCategory(TenantTypeCategory.DevFabric), TestCategory(TenantTypeCategory.Cloud)]
         public void CloudBlobContainerListBlobs()
         {
-            CloudBlobContainer container = GetRandomContainerReference();
+            CloudBlobClient client = GenerateCloudBlobClient();
+            client.DefaultRequestOptions.LocationMode = RetryPolicies.LocationMode.PrimaryThenSecondary;
+            CloudBlobContainer container = client.GetContainerReference(GetRandomContainerName());
             try
             {
                 container.Create();
@@ -2072,6 +2074,7 @@ public void CloudBlobContainerListBlobs()
                 {
                     Assert.IsInstanceOfType(blobItem, typeof(CloudPageBlob));
                     Assert.IsTrue(blobNames.Remove(((CloudPageBlob)blobItem).Name));
+                    Assert.AreEqual(RetryPolicies.LocationMode.PrimaryThenSecondary, ((CloudPageBlob)blobItem).ServiceClient.DefaultRequestOptions.LocationMode);
                 }
             }
             finally
diff --git a/Test/ClassLibraryCommon/Blob/CloudBlockBlobTest.cs b/Test/ClassLibraryCommon/Blob/CloudBlockBlobTest.cs
@@ -3751,5 +3751,29 @@ private void DoTextUploadDownloadTask(string text, bool checkDifferentEncoding)
             }
         }
 #endif
+
+        [TestMethod]
+        [Description("Test server failure retry case.")]
+        [TestCategory(ComponentCategory.Blob)]
+        [TestCategory(TestTypeCategory.UnitTest)]
+        [TestCategory(SmokeTestCategory.NonSmoke)]
+        [TestCategory(TenantTypeCategory.DevFabric), TestCategory(TenantTypeCategory.Cloud)]
+        public void CloudBlockBlobFailoverRetry()
+        {
+            OperationContext opContext = new OperationContext();
+            CloudBlobClient badPrimaryClient = new CloudBlobClient(new StorageUri(new Uri("http://1.2.3.4/x//"), new Uri(TargetTenantConfig.BlobServiceSecondaryEndpoint)), TestBase.StorageCredentials);
+            CloudBlockBlob secondaryBlob = badPrimaryClient.GetContainerReference(GetRandomContainerName()).GetBlockBlobReference("testblob");
+            badPrimaryClient.DefaultRequestOptions.RetryPolicy = new RetryPolicies.LinearRetry(TimeSpan.Zero, 1);
+            badPrimaryClient.DefaultRequestOptions.LocationMode = RetryPolicies.LocationMode.PrimaryThenSecondary;
+            try
+            {
+                secondaryBlob.DownloadText(operationContext: opContext);
+            }
+            catch (StorageException)
+            {
+                Assert.IsTrue(opContext.RequestResults.Count > 1);
+                Assert.AreEqual(StorageLocation.Secondary, opContext.LastResult.TargetLocation);
+            }
+        }
     }
 }
diff --git a/Test/WindowsDesktop/Properties/AssemblyInfo.cs b/Test/WindowsDesktop/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.2.1.0")]
+[assembly: AssemblyFileVersion("4.2.1.0")]
diff --git a/Test/WindowsPhone/Properties/AssemblyInfo.cs b/Test/WindowsPhone/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.2.1.0")]
+[assembly: AssemblyFileVersion("4.2.1.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Test/WindowsPhone81/Properties/AssemblyInfo.cs b/Test/WindowsPhone81/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.2.1.0")]
+[assembly: AssemblyFileVersion("4.2.1.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Test/WindowsRuntime/Blob/ExceptionHResultTest.cs b/Test/WindowsRuntime/Blob/ExceptionHResultTest.cs
@@ -102,7 +102,7 @@ public async Task CloudBlobUploadTimeoutAsync()
             }
             catch (Exception e)
             {
-                Assert.AreEqual(WindowsAzureErrorCode.TimeoutException, e.HResult);
+                Assert.AreEqual(WindowsAzureErrorCode.HttpRequestTimeout, e.HResult);
             }
             finally
             {
diff --git a/Test/WindowsRuntime/File/FileExceptionHResultTest.cs b/Test/WindowsRuntime/File/FileExceptionHResultTest.cs
@@ -101,7 +101,7 @@ public async Task CloudFileUploadTimeoutAsync()
             }
             catch (Exception e)
             {
-                Assert.AreEqual(WindowsAzureErrorCode.TimeoutException, e.InnerException.InnerException.HResult);
+                Assert.AreEqual(WindowsAzureErrorCode.HttpRequestTimeout, e.InnerException.InnerException.HResult);
             }
             finally
             {
diff --git a/Test/WindowsRuntime/Properties/AssemblyInfo.cs b/Test/WindowsRuntime/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.2.1.0")]
+[assembly: AssemblyFileVersion("4.2.1.0")]
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,9 @@
+Changes in 4.2.1 : 
+
+ - All: Fixed a bug where a TimeoutException was not properly retried.
+ - All: Fixed a bug where the IngressBytes of a RequestResult was not properly set in the exception case.
+ - All: Fixed a bug where default request options were overwritten on the resulting objects returned from a ListBlobs call.
+
 Changes in 4.2.0 :
 
   - All: Added the NameValidator class which contains helpers that check to see if resource names are valid.

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,11 @@ private void ParseQueryAndVerify(StorageUri address, StorageCredentials credenti`
`515`	`515`	`this.SnapshotTime = parsedSnapshot;`
`516`	`516`	`}`
`517`	`517`
`518`		`- this.ServiceClient = new CloudBlobClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials ?? parsedCredentials);`
	`518`	`+ if (this.ServiceClient == null)`
	`519`	`+ {`
	`520`	`+ this.ServiceClient = new CloudBlobClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials ?? parsedCredentials);`
	`521`	`+ }`
	`522`	`+`
`519`	`523`	`this.Name = NavigationHelper.GetBlobName(this.Uri, this.ServiceClient.UsePathStyleUris);`
`520`	`524`	`}`
`521`	`525`	`}`
Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,11 @@ private void ParseQueryAndVerify(StorageUri address, StorageCredentials credenti`
`512`	`512`	`this.SnapshotTime = parsedSnapshot;`
`513`	`513`	`}`
`514`	`514`
`515`		`- this.ServiceClient = new CloudBlobClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials ?? parsedCredentials);`
	`515`	`+ if (this.ServiceClient == null)`
	`516`	`+ {`
	`517`	`+ this.ServiceClient = new CloudBlobClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials ?? parsedCredentials);`
	`518`	`+ }`
	`519`	`+`
`516`	`520`	`this.Name = NavigationHelper.GetBlobName(this.Uri, this.ServiceClient.UsePathStyleUris);`
`517`	`521`	`}`
`518`	`522`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,11 @@ public CloudFileDirectory Parent`
`262`	`262`	`private void ParseQueryAndVerify(StorageUri address, StorageCredentials credentials)`
`263`	`263`	`{`
`264`	`264`	`this.attributes.StorageUri = address;`
`265`		`- this.ServiceClient = new CloudFileClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials);`
	`265`	`+ if (this.ServiceClient == null)`
	`266`	`+ {`
	`267`	`+ this.ServiceClient = new CloudFileClient(NavigationHelper.GetServiceClientBaseAddress(this.StorageUri, null /* usePathStyleUris */), credentials);`
	`268`	`+ }`
	`269`	`+`
`266`	`270`	`this.Name = NavigationHelper.GetFileName(this.Uri, this.ServiceClient.UsePathStyleUris);`
`267`	`271`	`}`
`268`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ private static StorageException CoreTranslate(Exception ex, RequestResult reqRes`
`252`	`252`	`else if (ex is TimeoutException)`
`253`	`253`	`{`
`254`	`254`	`reqResult.HttpStatusMessage = null;`
`255`		`- reqResult.HttpStatusCode = (int)HttpStatusCode.Unused;`
	`255`	`+ reqResult.HttpStatusCode = (int)HttpStatusCode.RequestTimeout;`
`256`	`256`	`reqResult.ExtendedErrorInformation = null;`
`257`	`257`	`return new StorageException(reqResult, ex.Message, ex);`
`258`	`258`	`}`
`@@ -309,7 +309,7 @@ internal static StorageException TranslateDataServiceException(Exception ex, Req`
`309`	`309`	`else if (ex is TimeoutException)`
`310`	`310`	`{`
`311`	`311`	`reqResult.HttpStatusMessage = null;`
`312`		`- reqResult.HttpStatusCode = (int)HttpStatusCode.Unused;`
	`312`	`+ reqResult.HttpStatusCode = (int)HttpStatusCode.RequestTimeout;`
`313`	`313`	`reqResult.ExtendedErrorInformation = null;`
`314`	`314`	`return new StorageException(reqResult, ex.Message, ex);`
`315`	`315`	`}`
`@@ -351,6 +351,13 @@ private static void PopulateRequestResult(RequestResult reqResult, HttpWebRespon`
`351`	`351`	`string tempDate = HttpWebUtility.TryGetHeader(response, "Date", null);`
`352`	`352`	`reqResult.RequestDate = string.IsNullOrEmpty(tempDate) ? DateTime.Now.ToString("R", CultureInfo.InvariantCulture) : tempDate;`
`353`	`353`	`reqResult.Etag = response.Headers[HttpResponseHeader.ETag];`
	`354`	`+#endif`
	`355`	`+ }`
	`356`	`+`
	`357`	`+ if (response.ContentLength > 0)`
	`358`	`+ {`
	`359`	`+#if !WINDOWS_RT`
	`360`	`+ reqResult.IngressBytes += response.ContentLength;`
`354`	`361`	`#endif`
`355`	`362`	`}`
`356`	`363`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Microsoft Azure Storage SDK for .NET (4.2.0)`
	`1`	`+# Microsoft Azure Storage SDK for .NET (4.2.1)`
`2`	`2`
`3`	`3`	`The Microsoft Azure Storage SDK for .NET allows you to build Azure applications`
`4`	`4`	`that take advantage of scalable cloud computing resources.`