Skip to content

Kill native processes in pipeline when pipeline is Disposed on Unix #15287

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
Dongbo Wang (daxian-dbw) merged 3 commits into from
Apr 26, 2021
Merged

Kill native processes in pipeline when pipeline is Disposed on Unix #15287

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
d171392
Kill native processes in pipeline when pipeline is Disposed
SteveL-MSFT Apr 20, 2021
43c3ee9
Fix so kill is only on Unix while Windows keeps Dispose()
SteveL-MSFT Apr 21, 2021
a9b15bb
Update src/System.Management.Automation/engine/NativeCommandProcessor.cs
SteveL-MSFT Apr 22, 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
14 changes: 13 additions & 1 deletion src/System.Management.Automation/engine/NativeCommandProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,9 +1018,21 @@ private void CleanUp()

try
{
// Dispose the process if it's already created
if (_nativeProcess != null)
{
// on Unix, we need to kill the process to ensure it terminates as Dispose() merely
// closes the redirected streams and the processs does not exit on macOS. However,
// on Windows, a winexe like notepad should continue running so we don't want to kill it.
#if UNIX
try
{
_nativeProcess.Kill();
}
catch
{
// Ignore all exception since it is cleanup.
}
#endif
_nativeProcess.Dispose();
}
}
Expand Down
6 changes: 6 additions & 0 deletions test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ Describe 'native commands with pipeline' -tags 'Feature' {
$result[0] | Should -Match "pwsh"
}
}

It 'native command should be killed when pipeline is disposed' -Skip:($IsWindows) {
$yes = (Get-Process 'yes' -ErrorAction Ignore).Count
yes | Select-Object -First 2
(Get-Process 'yes' -ErrorAction Ignore).Count | Should -Be $yes
}
}

Describe "Native Command Processor" -tags "Feature" {
Expand Down