Skip to content
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.

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

Add WithProcessKill DeleteOpt #1301

Merged
merged 1 commit into from Aug 8, 2017
Merged

Conversation

crosbymichael
Copy link
Member

Add an option that allows users for force kill and delete a process/task
when calling Delete

Fixes #1274

Signed-off-by: Michael Crosby crosbymichael@gmail.com

t.Error(err)
return
}
if _, err := task.Delete(ctx); err == nil {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One delete too many

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm testing before and after with the option

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, read the condition wrong, my bad 👍

@Random-Liu
Copy link
Member

LGTM. Thanks!

@stevvooe
Copy link
Member

stevvooe commented Aug 8, 2017

LGTM

Add an option that allows users for force kill and delete a process/task
when calling `Delete`

Fixes containerd#1274

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
@crosbymichael
Copy link
Member Author

Fixed the checkpoint tests that were broken after this change.

@codecov-io
Copy link

Codecov Report

Merging #1301 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1301   +/-   ##
=======================================
  Coverage   33.96%   33.96%           
=======================================
  Files          24       24           
  Lines        2723     2723           
=======================================
  Hits          925      925           
  Misses       1598     1598           
  Partials      200      200

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d4be982...d8c075a. Read the comment docs.

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@estesp estesp merged commit 42c1c9a into containerd:master Aug 8, 2017
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.

None yet

6 participants