Merge pull request Azure#4053 from hyonholee/preview

Increase the max size of vhd to 4TB.

Author: cormacpayne

src/ResourceManager/Compute/ChangeLog.md

@@ -20,6 +20,7 @@
 ## Current Release
 * Fix Test-AzureRmVMAEMExtension for virtual machines with multiple managed disks
 * Updated Set-AzureRmVMAEMExtension: Add caching information for Premium managed disks
+* Add-AzureRmVhd: The size limit on vhd is increased to 4TB.
 
 ## Version 3.0.0
 * Updated Set-AzureRmVMAEMExtension and Test-AzureRmVMAEMExtension cmdlets to support Premium managed disks

src/ServiceManagement/Compute/Sync/Upload/BlobCreatorBase.cs

@@ -39,7 +39,7 @@ public interface ICloudPageBlobObjectFactory
 
     public abstract class BlobCreatorBase
     {
-        private const long OneTeraByte = 1024L * 1024L * 1024L * 1024L;
+        private const long FourTeraByte = 4 * 1024L * 1024L * 1024L * 1024L;
 
         protected FileInfo localVhd;
         protected readonly ICloudPageBlobObjectFactory blobObjectFactory;
@@ -96,10 +96,10 @@ private static void AssertIfValidVhdSize(FileInfo fileInfo)
         {
             using (var stream = new VirtualDiskStream(fileInfo.FullName))
             {
-                if (stream.Length > OneTeraByte)
+                if (stream.Length > FourTeraByte)
                 {
                     var lengthString = stream.Length.ToString("N0", CultureInfo.CurrentCulture);
-                    var expectedLengthString = OneTeraByte.ToString("N0", CultureInfo.CurrentCulture);
+                    var expectedLengthString = FourTeraByte.ToString("N0", CultureInfo.CurrentCulture);
                     string message = String.Format("VHD size is too large ('{0}'), maximum allowed size is '{1}'.", lengthString, expectedLengthString);
                     throw new InvalidOperationException(message);
                 }

src/ServiceManagement/Services/Commands.Utilities/ChangeLog.md

@@ -19,6 +19,8 @@
 -->
 ## Current Release
 
+* Add-AzureVhd: The size limit on vhd is increased to 4TB.
+
 ## Version 4.0.0
 
 ## Version 3.8.0