Skip to content

native: fix deadlock from leaving transactions open#6722

Merged
estesp merged 1 commit intocontainerd:mainfrom
tonistiigi:snapshot-deadlocks
Mar 24, 2022
Merged

native: fix deadlock from leaving transactions open#6722
estesp merged 1 commit intocontainerd:mainfrom
tonistiigi:snapshot-deadlocks

Conversation

@tonistiigi
Copy link
Copy Markdown
Member

Signed-off-by: Tonis Tiigi [email protected]

@thaJeztah
Copy link
Copy Markdown
Member

This needing a cherry pick for 1.6?

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Mar 23, 2022

Build succeeded.

@tonistiigi
Copy link
Copy Markdown
Member Author

This needing a cherry pick for 1.6?

Deadlocks should be with a pretty high priority so yes.

@thaJeztah
Copy link
Copy Markdown
Member

do you know if it affects 1.5 as well?

@tonistiigi
Copy link
Copy Markdown
Member Author

@thaJeztah Yes it does, but it doesn't affect moby as this code is not used there.

Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM on green lights

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

@estesp estesp merged commit db84fda into containerd:main Mar 24, 2022
@thaJeztah thaJeztah added cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch and removed cherry-pick/1.5.x labels Mar 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants