Skip to content

bugfix: cleanup dangling shim by brand new context#4048

Merged
estesp merged 1 commit intocontainerd:masterfrom
fuweid:me-use-new-ctx-to-cleanup
Feb 24, 2020
Merged

bugfix: cleanup dangling shim by brand new context#4048
estesp merged 1 commit intocontainerd:masterfrom
fuweid:me-use-new-ctx-to-cleanup

Conversation

@fuweid
Copy link
Copy Markdown
Member

@fuweid fuweid commented Feb 21, 2020

When there is timeout or cancel for create container, killShim will fail
because of canceled context. The shim will be dangling and unmanageable.

Need to use new context to do cleanup.

Signed-off-by: Wei Fu [email protected]

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Feb 21, 2020

Build succeeded.

When there is timeout or cancel for create container, killShim will fail
because of canceled context. The shim will be dangling and unmanageable.

Need to use new context to do cleanup.

Signed-off-by: Wei Fu <[email protected]>
@fuweid fuweid force-pushed the me-use-new-ctx-to-cleanup branch from cf77e7e to 18e581d Compare February 21, 2020 08:50
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Feb 21, 2020

Build succeeded.

Copy link
Copy Markdown
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid
Copy link
Copy Markdown
Member Author

fuweid commented Feb 21, 2020

the flaky case is caused by using two same image in different cases. will file pr to fix it.

@fuweid
Copy link
Copy Markdown
Member Author

fuweid commented Feb 21, 2020

failed case is image_test.go:221: Expected actual usage to equal manifest reported usage of 9466142: got 10767844. will be fixed by #4049

Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

It could check if the error is a context cancell/deadline but this runs the risk of being racey anyway.

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

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