Skip to content

Update DataLakeStore data plane library #7718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 31, 2018
Merged

Update DataLakeStore data plane library #7718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c20fddd
Update dataplane version to 1.1.10
rahuldutta90 Oct 8, 2018
6d87c5c
Merge branch 'preview' into task-update-datalakedataplanenuget
cormacpayne Oct 8, 2018
f2719f6
Fix the test not running issue because of dependency of one of the de…
rahuldutta90 Oct 9, 2018
3a7d007
Merge branch 'task-update-datalakedataplanenuget' of https://github.c…
rahuldutta90 Oct 9, 2018
d0707cd
Merge preview
rahuldutta90 Oct 25, 2018
c22810e
Add default concurrency to multithreaded operations
Oct 27, 2018
437fa3b
Remove duplicate microsoft.azure.Management.Datalakestore reference i…
rahuldutta90 Oct 31, 2018
31b44de
Merge branch 'task-update-datalakedataplanenuget' of https://github.c…
rahuldutta90 Oct 31, 2018
5d9ee40
Merge branch 'release-2018-11-06' into task-update-datalakedataplanen…
markcowl Oct 31, 2018
344b0e1
Remove app.config for DLS tests
markcowl Oct 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/ResourceManager/DataLakeStore/Commands.DataLakeStore.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.1-preview" targetFramework="net45" />
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
<package id="Moq" version="4.2.1510.2205" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />
Expand Down
2 changes: 2 additions & 0 deletions src/ResourceManager/DataLakeStore/Commands.DataLakeStore/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
- Additional information about change #1
-->
## Current Release
* Update the DataLake package to 1.1.10.
* Add default Concurrency to multithreaded operations.

## Version 6.2.0
* Adding support for Virtual Network Rules
Expand Down
2 changes: 1 addition & 1 deletion ...esourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.DataLake.Store" Version="1.1.9" />
<PackageReference Include="Microsoft.Azure.DataLake.Store" Version="1.1.10" />
<PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
<PackageReference Include="NLog" Version="4.5.0" />
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/DataLakeStore/Commands.DataLakeStore/Commands.DataLakeStore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<ItemGroup>
<Reference Include="Microsoft.Azure.DataLake.Store, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.DataLake.Store.1.1.9\lib\net452\Microsoft.Azure.DataLake.Store.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.DataLake.Store.1.1.10\lib\net452\Microsoft.Azure.DataLake.Store.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataLake.Store, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
5 changes: 4 additions & 1 deletion ...Commands.DataLakeStore/DataPlaneCommands/ExportAzureRmDataLakeStoreChildItemProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,11 @@ public class ExportAzureRmDataLakeStoreChildItemProperties : DataLakeStoreFileSy

public override void ExecuteCmdlet()
{
// Currently SDK default thread calculation is not correct, so pass a default thread count
int threadCount = Concurrency == -1 ? DataLakeStoreFileSystemClient.ImportExportMaxThreads : Concurrency;

DataLakeStoreFileSystemClient.GetFileProperties(Account, Path.TransformedPath, GetAcl, OutputPath,
GetDiskUsage, !SaveToAdl, Concurrency, IncludeFile, HideConsistentAcl, MaximumDepth, this, CmdletCancellationToken);
GetDiskUsage, !SaveToAdl, threadCount, IncludeFile, HideConsistentAcl, MaximumDepth, this, CmdletCancellationToken);
if (PassThru)
{
WriteObject(true);
Expand Down
3 changes: 2 additions & 1 deletion .../DataLakeStore/Commands.DataLakeStore/DataPlaneCommands/ExportAzureRmDataLakeStoreItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ public override void ExecuteCmdlet()
DataLakeStoreFileSystemClient.SetupFileLogging(DiagnosticLogLevel, diagnosticPath);
}

int threadCount = Concurrency;
// Currently SDK default thread calculation is not correct, so pass a default thread count
int threadCount = Concurrency == -1 ? DataLakeStoreFileSystemClient.ImportExportMaxThreads : Concurrency;
DataLakeStoreFileSystemClient.BulkCopy(powerShellReadyPath, Account,
Path.TransformedPath, CmdletCancellationToken, threadCount, Recurse, Force, Resume, true, this);
WriteObject(powerShellReadyPath);
Expand Down
4 changes: 3 additions & 1 deletion .../DataLakeStore/Commands.DataLakeStore/DataPlaneCommands/ImportAzureRmDataLakeStoreItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ public override void ExecuteCmdlet()
DataLakeStoreFileSystemClient.SetupFileLogging(DiagnosticLogLevel, diagnosticPath);
}

int threadCount = Concurrency;
// Currently SDK default thread calculation is not correct, so pass a default thread count
int threadCount = Concurrency == -1 ? DataLakeStoreFileSystemClient.ImportExportMaxThreads : Concurrency;

DataLakeStoreFileSystemClient.BulkCopy(Destination.TransformedPath, Account,
powerShellSourcePath, CmdletCancellationToken, threadCount, Recurse, Force, Resume, false, this, ForceBinary);
// only attempt to write output if this cmdlet hasn't been cancelled.
Expand Down
5 changes: 4 additions & 1 deletion ...eStore/Commands.DataLakeStore/DataPlaneCommands/RemoveAzureRmDataLakeStoreItemAclEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,11 @@ public override void ExecuteCmdlet()
{
if (Recurse)
{
// Currently SDK default thread calculation is not correct, so pass a default thread count
int threadCount = Concurrency == -1 ? DataLakeStoreFileSystemClient.ImportExportMaxThreads : Concurrency;

DataLakeStoreFileSystemClient.ChangeAclRecursively(Path.TransformedPath,
Account, aclSpec, RequestedAclType.RemoveAcl, Concurrency, this, ShowProgress, CmdletCancellationToken);
Account, aclSpec, RequestedAclType.RemoveAcl, threadCount, this, ShowProgress, CmdletCancellationToken);
}
else
{
Expand Down
7 changes: 5 additions & 2 deletions .../DataLakeStore/Commands.DataLakeStore/DataPlaneCommands/SetAzureRmDataLakeStoreItemAcl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,12 @@ public override void ExecuteCmdlet()
{
if (Recurse)
{
DataLakeStoreFileSystemClient.ChangeAclRecursively(Path.TransformedPath,
// Currently SDK default thread calculation is not correct, so pass a default thread count
int threadCount = Concurrency == -1 ? DataLakeStoreFileSystemClient.ImportExportMaxThreads : Concurrency;

DataLakeStoreFileSystemClient.ChangeAclRecursively(Path.TransformedPath,
Account,
Acl.Select(entry => entry.ParseDataLakeStoreItemAce()).ToList(), RequestedAclType.SetAcl, Concurrency, this, ShowProgress, CmdletCancellationToken);
Acl.Select(entry => entry.ParseDataLakeStoreItemAce()).ToList(), RequestedAclType.SetAcl, threadCount, this, ShowProgress, CmdletCancellationToken);
}
else
{
Expand Down
4 changes: 3 additions & 1 deletion ...LakeStore/Commands.DataLakeStore/DataPlaneCommands/SetAzureRmDataLakeStoreItemAclEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,12 @@ public override void ExecuteCmdlet()
{
if (Recurse)
{
// Currently SDK default thread calculation is not correct, so pass a default thread count
int threadCount = Concurrency == -1 ? DataLakeStoreFileSystemClient.ImportExportMaxThreads : Concurrency;

DataLakeStoreFileSystemClient.ChangeAclRecursively(Path.TransformedPath,
Account,
aclSpec, RequestedAclType.ModifyAcl, Concurrency, this, ShowProgress, CmdletCancellationToken);
aclSpec, RequestedAclType.ModifyAcl, threadCount, this, ShowProgress, CmdletCancellationToken);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion ...ger/DataLakeStore/Commands.DataLakeStore/DataPlaneModels/DataLakeStoreFileSystemClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class DataLakeStoreFileSystemClient
private readonly Random _uniqueActivityIdGenerator;
private const int MaxConnectionLimit = 1000;
private const long NeverExpireValue = 253402300800000;
internal const int ImportExportMaxThreads = 256;
internal const int ImportExportMaxThreads = 128;
private readonly LoggingConfiguration _adlsLoggerConfig;
private readonly bool _isDebugEnabled;
private const int DebugMessageFlushThreshold = 500;
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/DataLakeStore/Commands.DataLakeStore/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Azure.DataLake.Store" version="1.1.9" targetFramework="net452" />
<package id="Microsoft.Azure.DataLake.Store" version="1.1.10" targetFramework="net452" />
<package id="Microsoft.Azure.Management.DataLake.Store" version="2.4.2-preview" targetFramework="net452" />
<package id="NLog" version="4.4.12" targetFramework="net452" />
</packages>