This repository has been archived by the owner on Nov 1, 2022. It is now read-only.
Make upstream.Close() wait for shutdown #1015
Merged
Conversation
This file contains 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
We let main() exit, and block on graceful shutdown in a `defer`ed procedure. We _also_ `defer` a call to `upstream.Close()`, which stops the upstream reconnecting and closes it. The two deferred procedure calls used to be in such an order that by coincidence, `upstream.Close()` was _also_ blocked on graceful shutdown. But this order was shuffled in PR #962. This commit makes the `upstream.Close()` explicitly wait for shutdown.
samb1729
approved these changes
Mar 20, 2018
Yeah; this is just a last-chance cleanup. (Better would be to use the same shutdown protocol for the upstream; let's save that for a bigger refactor) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
We let main() exit, and block on graceful shutdown in a
deferedprocedure. We also
defera call toupstream.Close(), which stopsthe upstream reconnecting and closes it.
The two deferred procedure calls used to be in such an order that by
coincidence,
upstream.Close()was also blocked on gracefulshutdown. But this order was shuffled in PR #962.
This commit makes the
upstream.Close()explicitly wait for shutdown.Fixes weaveworks/service-conf#2053.