Repository navigation
[flutter_tools] Wait for TCP server socket to close in DaemonServer.run() - #193714
Merged
auto-submit[bot] merged 2 commits intoOct 6, 2026
Merged
Conversation
github-actions
Bot
added
the
tool
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request updates the DaemonServer to wait for the server socket stream to close by awaiting subscription.asFuture() before cancelling the subscription, and adds a corresponding test. The review feedback suggests wrapping the await in a try-finally block to ensure the subscription is always cancelled even if an error occurs on the stream.
Comment on lines
224
to
225
| await subscription.asFuture<void>(); | ||
| await subscription.cancel(); |
Contributor
There was a problem hiding this comment.
If an error occurs on the stream, subscription.asFuture<void>() will complete with that error immediately. Since cancelOnError is false by default, the subscription will remain active and leak resources because subscription.cancel() is bypassed when the error is thrown.
Wrapping the await in a try-finally block ensures that the subscription is always properly cancelled.
try {
await subscription.asFuture<void>();
} finally {
await subscription.cancel();
}
Contributor
Author
|
@bkonyi - This reverts your change, which I think was unintentional. Please take a look. |
bkonyi
self-requested a review
October 5, 2026 16:06
bkonyi
approved these changes
Oct 5, 2026
bkonyi
left a comment
bkonyi
left a comment
Contributor
There was a problem hiding this comment.
Thanks for catching this and adding a test!
auto-submit
Bot
removed
the
autosubmit
Contributor
|
autosubmit label was removed for flutter/flutter/193714, because This PR has not met approval requirements for merging. The PR author is not a member of flutter-hackers and needs 1 more review(s) in order to merge this PR.
|
chingjun
approved these changes
Oct 6, 2026
flutter-dashboard
Bot
removed
the
autosubmit
This was referenced Oct 6, 2026
suryaKommana2662
pushed a commit
to suryaKommana2662/flutter
that referenced
this pull request
Oct 29, 2026
…un() (flutter#193714) Restores `await subscription.asFuture<void>();` before `await subscription.cancel();` in `DaemonServer.run()`, which was inadvertently removed in flutter#192830. Without awaiting the subscription future, `flutter daemon --listen-on-tcp-port` immediately cancels the `ServerSocket` listener and exits right after binding. Part of flutter#188471 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
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
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.
Restores
await subscription.asFuture<void>();beforeawait subscription.cancel();inDaemonServer.run(), which was inadvertently removed in #192830. Without awaiting the subscription future,flutter daemon --listen-on-tcp-portimmediately cancels theServerSocketlistener and exits right after binding.Part of #188471
Pre-launch Checklist
///).