Skip to content

Commit 8d87ffa

Browse files
begoldsmbegoldsm
begoldsm
authored andcommitted
Update PowerShell to use the latest SDK
Missed DataLakeStore upgrade. Updates for file and folder download. Tests will be in the next iteration. Fixing the connection manager overwriting. This is important to ensure that we have enough connections available for ingress/egress scenarios, and it must be set before the client is first used. Updating the help for ADLS to include new download. Signed local package for testing. Add full path property to ADLS Items Remove private package. Official is published Adding official package from nuget. Missed one disable of tracing. Fixing ADL tests and re-running them This enables ADL tests to run during CI and gets them totally updated. fix to always copy ADL session records. Add links to AzureRM.Resources.ps1 Following the pattern from compute tests. Adding records directory info for mock server This is a requirement for the tests to be discovered when run in playback mode. Fix ADL tests and update changelog This updates the change log to reflect the changes made Fixes to datetime offset for listing jobs fix to import/export logic due to inverted parameters. Missed one of the test updates test fixes for ADLA and ADLS Add specific exclusion for ADL acls Inside of ACLs we allow ":", which breaks the playback of tests, since it encodes ":", which results in a missed match in the recorded json (which contains the colon). This fixes that so playback does not encode colons for paths that start with: /webhdfs/v1/?aclspec Fix missing resume and bad merge. update to latest version of the store package. Update to latest ADLS sdks replace local feed with signed package Update tests and fix null reference bug for ADLA Remove test package. Update ADLS Filesystem tests and SDK package There was an SDK package mismatch caught by tests. Fixing this. Update to latest ADLA SDK package. Reverting the ADLA package update. Remove app.config that was added nuget update Temporary addition of package to get signed build. Missed commit of the csproj. need a signed package.
1 parent 5b06895 commit 8d87ffa

File tree

10 files changed

+42
-17
lines changed

10 files changed

+42
-17
lines changed

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics.Test/Commands.DataLakeAnalytics.Test.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,11 @@
6363
<Private>True</Private>
6464
</Reference>
6565
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
6766
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.5-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
6867
<Private>True</Private>
6968
</Reference>
7069
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=0.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.2-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Store.0.12.4-preview\lib\net45\Microsoft.Azure.Management.DataLake.Store.dll</HintPath>
7371
<Private>True</Private>
7472
</Reference>
7573
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands.DataLakeAnalytics.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
4747
</Reference>
4848
<Reference Include="Microsoft.Azure.Management.DataLake.Analytics, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
49-
<SpecificVersion>False</SpecificVersion>
5049
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.Analytics.0.11.5-preview\lib\net45\Microsoft.Azure.Management.DataLake.Analytics.dll</HintPath>
5150
<Private>True</Private>
5251
</Reference>
@@ -193,4 +192,4 @@
193192
</ItemGroup>
194193
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
195194
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
196-
</Project>
195+
</Project>

src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.8-preview" targetFramework="net45" />
1616
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1717
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
18-
</packages>
18+
</packages>

src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/Commands.DataLakeStore.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.DataLake.StoreUploader, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.StoreUploader.0.10.5-preview\lib\net45\Microsoft.Azure.Management.DataLake.StoreUploader.dll</HintPath>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.StoreUploader.0.10.6-preview\lib\net45\Microsoft.Azure.Management.DataLake.StoreUploader.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -246,4 +246,4 @@
246246
<ItemGroup />
247247
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
248248
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
249-
</Project>
249+
</Project>

src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.DataLake.Store" version="0.12.4-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.DataLake.StoreUploader" version="0.10.5-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.DataLake.StoreUploader" version="0.10.6-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.ResourceManager" version="1.1.1-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.6052.28118-prerelease" targetFramework="net45" />
@@ -30,4 +30,4 @@
3030
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
3131
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
3232
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
33-
</packages>
33+
</packages>

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="Microsoft.Azure.Management.DataLake.StoreUploader, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.StoreUploader.0.10.5-preview\lib\net45\Microsoft.Azure.Management.DataLake.StoreUploader.dll</HintPath>
54+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataLake.StoreUploader.0.10.6-preview\lib\net45\Microsoft.Azure.Management.DataLake.StoreUploader.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -210,4 +210,4 @@
210210
</ItemGroup>
211211
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
212212
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
213-
</Project>
213+
</Project>

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/DataLakeStoreFileSystemClient.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,21 @@ public void CopyDirectory(
516516
{
517517
lock (ConsoleOutputLock)
518518
{
519-
progress.PercentComplete = (int)(1.0 * e.UploadedByteCount / e.TotalFileLength * 100);
519+
var toSet = (int)(1.0 * e.UploadedByteCount / e.TotalFileLength * 100);
520+
// powershell defect protection. If, through some defect in
521+
// our progress tracking, the number is outside of 0 - 100,
522+
// powershell will crash if it is set to that value. Instead
523+
// just keep the value unchanged in that case.
524+
if (toSet < 0 || toSet > 100)
525+
{
526+
progress.PercentComplete = progress.PercentComplete;
527+
}
528+
else
529+
{
530+
progress.PercentComplete = toSet;
531+
}
520532
progress.Activity = string.Format("Copying Folder: {0}{1}. Total bytes remaining: {2}. Total files remaining: {3}",
521-
sourceFolderPath, recursive ? " recursively" : string.Empty, e.TotalFileLength - e.UploadedByteCount, e.TotalFileCount - e.UploadedFileCount);
533+
sourceFolderPath, recursive ? " recursively" : string.Empty, e.TotalFileLength - e.UploadedByteCount, e.TotalFileCount - e.UploadedFileCount);
522534
}
523535
};
524536

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Models/DataLakeStoreItem.cs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,23 @@ public DataLakeStoreItem(FileStatusProperties property, string optionalName = ""
3737
base(property.AccessTime, property.BlockSize, property.ChildrenNum, property.Group, property.Length, property.ModificationTime, property.Owner, string.IsNullOrEmpty(optionalName) ? property.PathSuffix : optionalName, property.Permission, property.Type)
3838
{
3939
// create two new properties
40-
this.LastWriteTime = new DateTime(1970, 1, 1, 0, 0, 0, 0).AddMilliseconds((long)this.ModificationTime).ToLocalTime();
40+
try
41+
{
42+
this.LastWriteTime = new DateTime(1970, 1, 1, 0, 0, 0, 0).AddMilliseconds((long)this.ModificationTime).ToLocalTime();
43+
}
44+
catch(ArgumentOutOfRangeException)
45+
{
46+
if(this.ModificationTime < 0)
47+
{
48+
// set last write time to the min DateTime
49+
this.LastWriteTime = DateTime.MinValue;
50+
}
51+
else
52+
{
53+
this.LastWriteTime = DateTime.MaxValue;
54+
}
55+
}
56+
4157
this.Name = property.PathSuffix;
4258
if(!string.IsNullOrEmpty(optionalPath))
4359
{

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Management.DataLake.Store" version="0.12.4-preview" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.DataLake.StoreUploader" version="0.10.5-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.DataLake.StoreUploader" version="0.10.6-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
@@ -16,4 +16,4 @@
1616
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.8-preview" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
1818
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
19-
</packages>
19+
</packages>

0 commit comments

Comments
 (0)