Skip to content

logging: respect ctx#2727

Merged
AkihiroSuda merged 1 commit into
containerd:mainfrom
AkihiroSuda:fix-2726
Jan 3, 2024
Merged

logging: respect ctx#2727
AkihiroSuda merged 1 commit into
containerd:mainfrom
AkihiroSuda:fix-2726

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda commented Jan 2, 2024

The ctx is cancelled on SIGTERM

Fix #2726 (regression in #2683)

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

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

Projects

None yet

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