Make new config when retrying testServer creation #6204
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
alvin-huang
reviewed
Jul 24, 2019
| @@ -183,10 +185,6 @@ func newServer(c *Config) (*Server, error) { | |||
| oldNotify() | |||
| } | |||
| } | |||
| // Restore old notify to guard against re-closing `up` on a retry | |||
There was a problem hiding this comment.
I think you restored this yesterday, did you want to remove it again? Otherwise you might need to rebase.
There was a problem hiding this comment.
I want to remove it, don't need it anymore.
alvin-huang
approved these changes
Jul 24, 2019
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.
Generate new config (with new ports) when retrying testServerWithConfig.
Addresses issue where bind addr is already in use:
https://circleci.com/gh/hashicorp/consul/56536#tests/containers/1
This PR also removes the reset of
c.NotifyListen()innewServersince we are no longer using a single config across retries (#6200).