feat(etcd): support external standalone etcd #595
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
Codecov Report
@@ Coverage Diff @@
## main #595 +/- ##
==========================================
+ Coverage 80.06% 80.16% +0.10%
==========================================
Files 95 95
Lines 10956 10961 +5
==========================================
+ Hits 8772 8787 +15
+ Misses 1705 1698 -7
+ Partials 479 476 -3
Continue to review full report at Codecov.
|
samutamm
reviewed
Apr 27, 2022
pkg/option/option.go
Outdated
| @@ -245,6 +276,11 @@ func (opt *Options) Parse() (string, error) { | |||
| } | |||
|
|
|||
| opt.renameLegacyClusterRoles() | |||
|
|
|||
| if opt.UseStandaloneEtcd { | |||
| opt.ClusterRole = "secondary" | |||
There was a problem hiding this comment.
It could be more visible / explicit that when using "standalone" etcd, the cluster role cannot be "primary". Logging is not yet initialized here but maybe consider adding a comment:
Suggested change
| opt.ClusterRole = "secondary" | |
| opt.ClusterRole = "secondary" // when using external standalone etcd, the cluster role cannot be "primary" |
localvar
reviewed
Apr 29, 2022
pkg/cluster/cluster.go
Outdated
Comment on lines
378
to
387
| } else { | ||
| if c.opt.UseStandaloneEtcd { | ||
| err := c.Put(c.Layout().ClusterNameKey(), c.opt.ClusterName) | ||
| if err != nil { | ||
| return fmt.Errorf("register cluster name %s failed: %v", | ||
| c.opt.ClusterName, err) | ||
| } | ||
| } else { | ||
| return fmt.Errorf("key %s not found", c.Layout().ClusterNameKey()) | ||
| } |
There was a problem hiding this comment.
to reduce nesting.
Suggested change
| } else { | |
| if c.opt.UseStandaloneEtcd { | |
| err := c.Put(c.Layout().ClusterNameKey(), c.opt.ClusterName) | |
| if err != nil { | |
| return fmt.Errorf("register cluster name %s failed: %v", | |
| c.opt.ClusterName, err) | |
| } | |
| } else { | |
| return fmt.Errorf("key %s not found", c.Layout().ClusterNameKey()) | |
| } | |
| } else if c.opt.UseStandaloneEtcd { | |
| err := c.Put(c.Layout().ClusterNameKey(), c.opt.ClusterName) | |
| if err != nil { | |
| return fmt.Errorf("register cluster name %s failed: %v", c.opt.ClusterName, err) | |
| } | |
| } else { | |
| return fmt.Errorf("key %s not found", c.Layout().ClusterNameKey()) |
pkg/option/option.go
Outdated
| opt.flags.StringVar(&opt.ClusterName, "cluster-name", "eg-cluster-default-name", "Human-readable name for the new cluster, ignored while joining an existed cluster.") | ||
| opt.flags.StringVar(&opt.ClusterRole, "cluster-role", "primary", "Cluster role for this member (primary, secondary).") | ||
| opt.flags.StringVar(&opt.ClusterRequestTimeout, "cluster-request-timeout", "10s", "Timeout to handle request in the cluster.") | ||
| opt.flags.StringVar(&opt.ClusterName, "cluster-name", "eg-cluster-default-name", |
There was a problem hiding this comment.
per https://github.com/golang/go/wiki/CodeReviewComments#line-length:
don't add line breaks to keep lines short when they are more readable long--for example, if they are repetitive.
please revert the newly added line breaks.
localvar
approved these changes
Apr 29, 2022
suchen-sci
approved these changes
May 5, 2022
localvar
pushed a commit
that referenced
this pull request
Jun 13, 2022
* feat(etcd): init * fix(statuscontroller): remove log * fix(option): add comment * fix(chart): fix typo * style(option): revert break line
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.
close #584