Skip to content

Check for more kill error types#3672

Merged
dmcgowan merged 1 commit intocontainerd:masterfrom
crosbymichael:kill-errors
Sep 23, 2019
Merged

Check for more kill error types#3672
dmcgowan merged 1 commit intocontainerd:masterfrom
crosbymichael:kill-errors

Conversation

@crosbymichael
Copy link
Copy Markdown
Member

For crun support.

Signed-off-by: Michael Crosby [email protected]

Signed-off-by: Michael Crosby <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 23, 2019

Build succeeded.

Comment thread pkg/process/utils.go
}
if strings.Contains(err.Error(), "os: process already finished") ||
strings.Contains(err.Error(), "container not running") ||
strings.Contains(strings.ToLower(err.Error()), "no such process") ||
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this different from unix.ESRCH {3, "ESRCH", "no such process"} check 1 line below? (link)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

just a string comp whenever the error is returned via stderr from a runtime process

Copy link
Copy Markdown
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

re-running flake failure on one of the 4 travis CI jobs

@dmcgowan dmcgowan added this to the 1.3 milestone Sep 23, 2019
@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #3672   +/-   ##
======================================
  Coverage      42%     42%           
======================================
  Files         129     129           
  Lines       14275   14275           
======================================
  Hits         5996    5996           
  Misses       7379    7379           
  Partials      900     900
Flag Coverage Δ
#linux 45.51% <ø> (ø) ⬆️
#windows 36.91% <ø> (ø) ⬆️

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 1af133f...0a21292. Read the comment docs.

Copy link
Copy Markdown
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

@dmcgowan dmcgowan merged commit 51f8807 into containerd:master Sep 23, 2019
@crosbymichael crosbymichael deleted the kill-errors branch September 24, 2019 12:24
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.

5 participants