Skip to content

*: enable prevote by default #1103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
disksing merged 4 commits into from
Jun 14, 2018
Merged

*: enable prevote by default #1103

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d82e7c
config: enable prevote by default
nolouch Jun 7, 2018
fc536dd
address comments
nolouch Jun 8, 2018
e048da0
address comments
nolouch Jun 8, 2018
eba62b5
Merge branch 'master' into enable-pre-vote
disksing Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions server/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ type Config struct {
TickInterval typeutil.Duration `toml:"tick-interval"`
// ElectionInterval is the interval for etcd Raft election.
ElectionInterval typeutil.Duration `toml:"election-interval"`
// DisablePrevote is true to disable Raft Pre-Vote.
// If enabled, Raft runs an additional election phase
// to check whether it would get enough votes to win
// an election, thus minimizing disruptions.
DisablePreVote bool `json:"disable-pre-vote"`
Copy link
Contributor

@siddontang siddontang Jun 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not using PreVote directly?

Copy link
Contributor Author

@nolouch nolouch Jun 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to enable it by default. use PreVote should distinguish whether the key exists in the TOML actually is false or not set it.

Copy link
Contributor

@siddontang siddontang Jun 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so, if not, use true directly.

We must explicitly set to false if we want to disable it.

Of course, you can add prevote=true in the example configuration.


Security SecurityConfig `toml:"security" json:"security"`

Expand Down Expand Up @@ -629,6 +634,7 @@ func (c *Config) genEmbedEtcdConfig() (*embed.Config, error) {
cfg.InitialCluster = c.InitialCluster
cfg.ClusterState = c.InitialClusterState
cfg.EnablePprof = true
cfg.PreVote = !c.DisablePreVote
cfg.StrictReconfigCheck = !c.disableStrictReconfigCheck
cfg.TickMs = uint(c.TickInterval.Duration / time.Millisecond)
cfg.ElectionMs = uint(c.ElectionInterval.Duration / time.Millisecond)
Expand Down