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

linux: skip errors from the runtime kill #2434

Merged
merged 1 commit into from
Jul 14, 2020

Conversation

giuseppe
Copy link
Member

@giuseppe giuseppe commented Jul 2, 2020

fix a race condition where the container process could exit before the
runtime sends the signal, causing the command to fail.

Part of: containers/crun#422

Signed-off-by: Giuseppe Scrivano [email protected]

What type of PR is this?

/kind api-change
/kind bug
/kind cleanup
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

How to verify it

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?


@giuseppe
Copy link
Member Author

giuseppe commented Jul 4, 2020

bors retry

@rhatdan
Copy link
Member

rhatdan commented Jul 6, 2020

LGTM

@rhatdan
Copy link
Member

rhatdan commented Jul 8, 2020

@giuseppe Could you rebase and repush.

fix a race condition where the container process could exit before the
runtime sends the signal, causing the command to fail.

Part of: containers/crun#422

Signed-off-by: Giuseppe Scrivano <[email protected]>
@giuseppe
Copy link
Member Author

giuseppe commented Jul 9, 2020

rebased

@giuseppe
Copy link
Member Author

finally green

@rhatdan
Copy link
Member

rhatdan commented Jul 11, 2020

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM

@vrothberg
Copy link
Member

bors r+

bors bot added a commit that referenced this pull request Jul 13, 2020
2434: linux: skip errors from the runtime kill r=vrothberg a=giuseppe

fix a race condition where the container process could exit before the
runtime sends the signal, causing the command to fail.

Part of: containers/crun#422

Signed-off-by: Giuseppe Scrivano <[email protected]>

<!--
Thanks for sending a pull request!

Please make sure you've read and understood our contributing guidelines
(https://github.com/containers/buildah/blob/master/CONTRIBUTING.md) as well as ensuring
that all your commits are signed with `git commit -s`.
-->

#### What type of PR is this?

<!--
Please label this pull request according to what type of issue you are
addressing, especially if this is a release targeted pull request.

Uncomment only one `/kind <>` line, hit enter to put that in a new line, and
remove leading whitespace from that line:
-->

> /kind api-change
> /kind bug
> /kind cleanup
> /kind deprecation
> /kind design
> /kind documentation
> /kind failing-test 
> /kind feature
> /kind flake
> /kind other

#### What this PR does / why we need it:

#### How to verify it

#### Which issue(s) this PR fixes:

<!--
Automatically closes linked issue when PR is merged.
Uncomment the following comment block and include the issue
number or None on one line.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`, or `None`.
-->

<!--
Fixes #
or
None
-->

#### Special notes for your reviewer:

#### Does this PR introduce a user-facing change?

<!--
If no, just write `None` in the release-note block below. If yes, a release note
is required: Enter your extended release note in the block below. If the PR
requires additional action from users switching to the new release, include the
string "action required".

For more information on release notes please follow the kubernetes model:
https://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note

```



Co-authored-by: Giuseppe Scrivano <[email protected]>
@bors
Copy link
Contributor

bors bot commented Jul 13, 2020

Build failed:

  • cirrus-ci/success

@rhatdan
Copy link
Member

rhatdan commented Jul 13, 2020

bors retry

bors bot added a commit that referenced this pull request Jul 13, 2020
2434: linux: skip errors from the runtime kill r=vrothberg a=giuseppe

fix a race condition where the container process could exit before the
runtime sends the signal, causing the command to fail.

Part of: containers/crun#422

Signed-off-by: Giuseppe Scrivano <[email protected]>

<!--
Thanks for sending a pull request!

Please make sure you've read and understood our contributing guidelines
(https://github.com/containers/buildah/blob/master/CONTRIBUTING.md) as well as ensuring
that all your commits are signed with `git commit -s`.
-->

#### What type of PR is this?

<!--
Please label this pull request according to what type of issue you are
addressing, especially if this is a release targeted pull request.

Uncomment only one `/kind <>` line, hit enter to put that in a new line, and
remove leading whitespace from that line:
-->

> /kind api-change
> /kind bug
> /kind cleanup
> /kind deprecation
> /kind design
> /kind documentation
> /kind failing-test 
> /kind feature
> /kind flake
> /kind other

#### What this PR does / why we need it:

#### How to verify it

#### Which issue(s) this PR fixes:

<!--
Automatically closes linked issue when PR is merged.
Uncomment the following comment block and include the issue
number or None on one line.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`, or `None`.
-->

<!--
Fixes #
or
None
-->

#### Special notes for your reviewer:

#### Does this PR introduce a user-facing change?

<!--
If no, just write `None` in the release-note block below. If yes, a release note
is required: Enter your extended release note in the block below. If the PR
requires additional action from users switching to the new release, include the
string "action required".

For more information on release notes please follow the kubernetes model:
https://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note

```



Co-authored-by: Giuseppe Scrivano <[email protected]>
@bors
Copy link
Contributor

bors bot commented Jul 13, 2020

Build failed:

  • cirrus-ci/success

@giuseppe
Copy link
Member Author

bors retry

bors bot added a commit that referenced this pull request Jul 14, 2020
2434: linux: skip errors from the runtime kill r=vrothberg a=giuseppe

fix a race condition where the container process could exit before the
runtime sends the signal, causing the command to fail.

Part of: containers/crun#422

Signed-off-by: Giuseppe Scrivano <[email protected]>

<!--
Thanks for sending a pull request!

Please make sure you've read and understood our contributing guidelines
(https://github.com/containers/buildah/blob/master/CONTRIBUTING.md) as well as ensuring
that all your commits are signed with `git commit -s`.
-->

#### What type of PR is this?

<!--
Please label this pull request according to what type of issue you are
addressing, especially if this is a release targeted pull request.

Uncomment only one `/kind <>` line, hit enter to put that in a new line, and
remove leading whitespace from that line:
-->

> /kind api-change
> /kind bug
> /kind cleanup
> /kind deprecation
> /kind design
> /kind documentation
> /kind failing-test 
> /kind feature
> /kind flake
> /kind other

#### What this PR does / why we need it:

#### How to verify it

#### Which issue(s) this PR fixes:

<!--
Automatically closes linked issue when PR is merged.
Uncomment the following comment block and include the issue
number or None on one line.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`, or `None`.
-->

<!--
Fixes #
or
None
-->

#### Special notes for your reviewer:

#### Does this PR introduce a user-facing change?

<!--
If no, just write `None` in the release-note block below. If yes, a release note
is required: Enter your extended release note in the block below. If the PR
requires additional action from users switching to the new release, include the
string "action required".

For more information on release notes please follow the kubernetes model:
https://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note

```



Co-authored-by: Giuseppe Scrivano <[email protected]>
@bors
Copy link
Contributor

bors bot commented Jul 14, 2020

Build failed:

  • cirrus-ci/success

@rhatdan
Copy link
Member

rhatdan commented Jul 14, 2020

@giuseppe Rebase and repush, and we can try again. Bors gets confused and the only way I have found out of it, is to repush.

@rhatdan
Copy link
Member

rhatdan commented Jul 14, 2020

Saving the planet.

@rhatdan rhatdan merged commit d2e0cd8 into containers:master Jul 14, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants