Skip to content

Forwarding progress stream changes from Foreach-Object -Parallel runspaces #14271

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
iSazonov merged 3 commits into from
Jul 31, 2021
Merged

Forwarding progress stream changes from Foreach-Object -Parallel runspaces #14271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
734db6f
Forwarding progress stream when running parallel
powercode Nov 26, 2020
3c2dd34
Adding test
powercode Nov 26, 2020
3f3a04b
Update test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-O…
powercode Jan 25, 2021
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
10 changes: 10 additions & 0 deletions src/System.Management.Automation/engine/hostifaces/PSTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ protected override void InitializePowershell()
_powershell.Streams.Warning.DataAdded += (sender, args) => HandleWarningData();
_powershell.Streams.Verbose.DataAdded += (sender, args) => HandleVerboseData();
_powershell.Streams.Debug.DataAdded += (sender, args) => HandleDebugData();
_powershell.Streams.Progress.DataAdded += (sender, args) => HandleProgressData();
_powershell.Streams.Information.DataAdded += (sender, args) => HandleInformationData();

// State change handler
Expand Down Expand Up @@ -132,6 +133,15 @@ private void HandleInformationData()
}
}

private void HandleProgressData()
{
foreach (var item in _powershell.Streams.Progress.ReadAll())
{
_dataStreamWriter.Add(
new PSStreamObject(PSStreamObjectType.Progress, item));
}
}

#endregion

#region Event handlers
Expand Down
13 changes: 13 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/Foreach-Object-Parallel.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,19 @@ Describe 'ForEach-Object -Parallel Basic Tests' -Tags 'CI' {
$actualDebug.Message | Should -BeExactly 'Debug!'
}

It 'Verifies progress data streaming' {

$ps = [Powershell]::Create([System.Management.Automation.RunspaceMode]::NewRunspace)

$ps.Commands.AddScript("`$ProgressPreference='Continue'; 1..2 | ForEach-Object -Parallel { Write-Progress -Activity Progress -Status Running }") | Out-Null
$ps.Invoke()
$pr = $ps.Streams.Progress.ReadAll()
$pr.Count | Should -Be 2
$pr[0].Activity | Should -Be Progress
$pr[0].StatusDescription | Should -Be Running
$ps.Dispose()
}

It 'Verifies information data streaming' {

$actualInformation = 1..1 | ForEach-Object -Parallel { Write-Information "Information!" } 6>&1
Expand Down