Fix deadlock in ttyWriter.Done()#13640
Merged
ndeloof merged 5 commits intodocker:mainfrom Mar 18, 2026
Merged
Conversation
maks2134
force-pushed
the
fix-ttywriter-deadlock
branch
from
14acc35 to
2bacf9f
Compare
ndeloof
requested changes
Mar 17, 2026
Contributor
ndeloof
left a comment
ndeloof
left a comment
There was a problem hiding this comment.
please exclude .idea from git commit (I have this as a global $HOME/.gitignore rule)
Contributor
|
@maks2134 can you sign-off your commits please, if you need help just follow this guideline |
added 2 commits
March 17, 2026 11:21
Resolves race condition between main thread calling Done() and UI thread calling printWithDimensions(). The issue was that Done() held the mutex while sending to the done channel, but the UI thread needed the same mutex to process the done signal. Fixed by sending the done signal before acquiring the mutex, allowing the UI thread to receive the signal and release any held locks. Fixes docker#13639 Signed-off-by: maks2134 <[email protected]>
Signed-off-by: maks2134 <[email protected]>
maks2134
force-pushed
the
fix-ttywriter-deadlock
branch
from
50518ee to
e351d62
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
added 3 commits
March 17, 2026 12:09
- Replace context.Background() with context.WithCancel() in test - Fix formatting issues (remove extra empty line) Signed-off-by: maks2134 <[email protected]>
- Replace context.Background() with t.Context() in TestDoneDeadlockFix - Ensures .idea files are not included in commit Signed-off-by: maks2134 <[email protected]>
Fixes template validation error in CI by updating to latest stable version of docker/github-builder workflow. This resolves the JToken parsing error in bake.yml@v1 that was causing bin-image-test to fail. Signed-off-by: maks2134 <[email protected]>
ndeloof
approved these changes
Mar 18, 2026
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Mar 25, 2026
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | patch | `v5.1.0` → `v5.1.1` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>docker/compose (docker/compose)</summary> ### [`v5.1.1`](https://github.com/docker/compose/releases/tag/v5.1.1) [Compare Source](docker/compose@v5.1.0...v5.1.1) #### What's Changed ##### 🐛 Fixes - Only pass ConsoleSize to ExecAttach when TTY is enabled by [@​mikesir87](https://github.com/mikesir87) in [#​13616](docker/compose#13616) - Fix deadlock in ttyWriter.Done() by [@​maks2134](https://github.com/maks2134) in [#​13640](docker/compose#13640) ##### ⚙️ Dependencies - update to go1.25.8 by [@​thaJeztah](https://github.com/thaJeztah) in [#​13622](docker/compose#13622) - bump github.com/moby/moby/api from 1.53.0 to 1.54.0 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​13619](docker/compose#13619) - bump golang.org/x/sys from 0.41.0 to 0.42.0 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​13626](docker/compose#13626) - bump github.com/containerd/containerd/v2 from 2.2.1 to 2.2.2 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​13631](docker/compose#13631) - bump golang.org/x/sync from 0.19.0 to 0.20.0 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​13627](docker/compose#13627) - bump github.com/moby/moby/client from 0.2.2 to 0.3.0 by [@​dependabot](https://github.com/dependabot)\[bot] in [#​13621](docker/compose#13621) #### New Contributors - [@​maks2134](https://github.com/maks2134) made their first contribution in [#​13640](docker/compose#13640) **Full Changelog**: <docker/compose@v5.1.0...v5.1.1> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My44Ny4xIiwidXBkYXRlZEluVmVyIjoiNDMuODcuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90IiwiYXV0b21hdGlvbjpib3QtYXV0aG9yZWQiLCJkZXBlbmRlbmN5LXR5cGU6OnBhdGNoIl19-->
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves race condition between main thread calling Done() and UI thread calling printWithDimensions(). The issue was that Done() held the mutex while sending to the done channel, but the UI thread needed the same mutex to process the done signal.
Fixed by sending the done signal before acquiring the mutex, allowing the UI thread to receive the signal and release any held locks.
Fixes #13639
What I did
Related issue
(not mandatory) A picture of a cute animal, if possible in relation to what you did