Skip to content

[release/0.9] Make kill noop on second run#1275

Merged
dcantah merged 1 commit intomicrosoft:release/0.9from
dcantah:backport-killnoop
Jan 11, 2022
Merged

[release/0.9] Make kill noop on second run#1275
dcantah merged 1 commit intomicrosoft:release/0.9from
dcantah:backport-killnoop

Conversation

@dcantah
Copy link
Copy Markdown
Contributor

@dcantah dcantah commented Jan 11, 2022

If a kill has already been delivered, ignore subsequent calls to
Kill() and simply return the previous status.

This change also defines ErrProcessAlreadyStopped and ignores that
error if encountered during kill.

Signed-off-by: Gabriel Adrian Samfira gsamfira@cloudbasesolutions.com
(cherry picked from commit a8605ec)
Signed-off-by: Daniel Canter dcanter@microsoft.com

This is one of the fixes intended to help get the TestRestartMonitor test operational for Windows in upstream containerd

If a kill has already been delivered, ignore subsequent calls to
Kill() and simply return the previous status.

This change also defines ErrProcessAlreadyStopped and ignores that
error if encountered during kill.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
(cherry picked from commit a8605ec)
Signed-off-by: Daniel Canter <dcanter@microsoft.com>
@dcantah dcantah requested a review from a team as a code owner January 11, 2022 01:27
@dcantah dcantah merged commit d615e4a into microsoft:release/0.9 Jan 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants