embed: Delay setting initial cluster #7517
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
heyitsanthony
suggested changes
Mar 16, 2017
embed/config.go
Outdated
| @@ -246,6 +245,9 @@ func (cfg *configYAML) configFromFile(path string) error { | |||
| cfg.ACUrls = []url.URL(u) | |||
| } | |||
|
|
|||
| if (cfg.Durl == "" && cfg.DNSCluster == "") && cfg.InitialCluster == "" { | |||
There was a problem hiding this comment.
probably have cfg.InitialCluster == cfg.InitialClusterFromName(DefaultName) instead of == "" and keep the InitialCluster line in NewConfig? otherwise the default will be blank for non-yaml cases
There was a problem hiding this comment.
👍
Have left the default and instead clear it once we have parsed the config.
jsok
force-pushed
the
7516-discovery-flags
branch
2 times, most recently
from
c18262d
to
0dd8f4f
Compare
NewConfig() should sets initial cluster from name but we should clear it in the event that another discovery option has been specified. Fixes etcd-io#7516
jsok
force-pushed
the
7516-discovery-flags
branch
from
0dd8f4f
to
1a91ed0
Compare
Codecov Report
@@ Coverage Diff @@
## master #7517 +/- ##
=========================================
Coverage ? 70.66%
=========================================
Files ? 320
Lines ? 26205
Branches ? 0
=========================================
Hits ? 18518
Misses ? 6246
Partials ? 1441
Continue to review full report at Codecov.
|
heyitsanthony
approved these changes
Mar 16, 2017
|
lgtm |
jsok
added a commit
to jsok/etcd
that referenced
this pull request
Mar 28, 2017
NewConfig() sets an initial cluster (potentially using a default name) but we should clear it in the event another discovery option has been specified. PR etcd-io#7517 attempted to address this however it only worked if the name was left as "default". (Completely) Fixes etcd-io#7516
jsok
added a commit
to jsok/etcd
that referenced
this pull request
Mar 30, 2017
NewConfig() sets an initial cluster (potentially using a default name) but we should clear it in the event another discovery option has been specified. PR etcd-io#7517 attempted to address this however it only worked if the name was left as "default". (Completely) Fixes etcd-io#7516
jsok
added a commit
to jsok/etcd
that referenced
this pull request
Mar 30, 2017
NewConfig() sets an initial cluster (potentially using a default name) but we should clear it in the event another discovery option has been specified. PR etcd-io#7517 attempted to address this however it only worked if the name was left as "default". (Completely) Fixes etcd-io#7516
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.
embed.NewConfig()sets the initial cluster from name but we should clear it in the event that another discovery option has been specified.Fixes #7516