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.

Sign up for GitHub

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

Jump to bottom

logging: respect ctx #2727

Merged
merged 1 commit into from
Jan 3, 2024
Merged

logging: respect ctx #2727

merged 1 commit into from
Jan 3, 2024

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Jan 2, 2024 •
edited
Loading

The ctx is cancelled on SIGTERM

Fix #2726 (regression in #2683)

@AkihiroSuda AkihiroSuda added this to the v1.8.0 (tentative) milestone Jan 2, 2024
djdongjin
djdongjin approved these changes Jan 2, 2024
View reviewed changes
Copy link
Member

@djdongjin djdongjin left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

Also is it possible to add a test that can capture the regression and demonstrate the fix? For example, test sudo nerdctl run --rm hello-world can be finished in, e.g., 5s. (not sure if this will be flaky).

@vsiravar vsiravar mentioned this pull request Jan 2, 2024
Merged
@AkihiroSuda
logging: respect ctx
b045866 
The ctx is cancelled on SIGTERM

Fix issue 2726 (regression in PR 2683)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda
Copy link
Member Author

Also is it possible to add a test that can capture the regression and demonstrate the fix? For example, test sudo nerdctl run --rm hello-world can be finished in, e.g., 5s. (not sure if this will be flaky).

Added TestRunRmTime to test this

@AkihiroSuda AkihiroSuda merged commit e17a336 into containerd:main Jan 3, 2024
22 checks passed
@AkihiroSuda AkihiroSuda modified the milestones: v2.0.0, v1.7.3 Jan 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@djdongjin djdongjin djdongjin approved these changes

Assignees
No one assigned
Labels
priority/high
Projects
None yet
Milestone
v1.7.3
Development

Successfully merging this pull request may close these issues.

[Regression in main (2023-12-19)] Removing a container takes more than 10 seconds
2 participants
@AkihiroSuda @djdongjin