*: upgrade etcd to master #1101
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
nolouch
requested review from
disksing and
siddontang
and removed request for
disksing
|
/run-all-tests |
siddontang
reviewed
Jun 4, 2018
server/join.go
Outdated
| initialCluster := "" | ||
| if wal.Exist(path.Join(cfg.DataDir, "member")) { | ||
| if wal.Exist(path.Join(cfg.DataDir, "member/wal")) { |
There was a problem hiding this comment.
oh, it breaks the compatibility?
There was a problem hiding this comment.
no, it's compatibility. but better to keep the previous logic. address it.
siddontang
reviewed
Jun 4, 2018
| @@ -42,6 +42,8 @@ func newTestSingleConfig() *embed.Config { | |||
| cfg.Name = "test_etcd" | |||
| cfg.Dir, _ = ioutil.TempDir("/tmp", "test_etcd") | |||
| cfg.WalDir = "" | |||
| cfg.Logger = "zap" | |||
There was a problem hiding this comment.
do we use zap in production?
There was a problem hiding this comment.
etcd plan to use zap replace the capnslog logging. and we only enable it in the test.
disksing
reviewed
Jun 5, 2018
server/server.go
Outdated
| @@ -285,6 +285,16 @@ func (s *Server) Run() error { | |||
| return nil | |||
| } | |||
|
|
|||
| // SetUpTestMode for testing | |||
| func (s *Server) SetUpTestMode() { | |||
There was a problem hiding this comment.
Can we do it in server.CreateServer? It looks verbose to call it in every tests...
|
LGTM. PTAL @siddontang @Connor1996 |
|
/run-all-tests |
disksing
approved these changes
Jun 7, 2018
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.
Changes:
embed.Config.InitialElectionTickAdvanceto enable/disable initial election tick fast-forward.embed.NewConfig()would return*embed.ConfigwithInitialElectionTickAdvanceas true bydefault.
--pre-voteflag to enable to run an additional Raft election phasewill enbale later
embed.CompactorModePeriodicforcompactor.ModePeriodic.compatible
embed.CompactorModeRevisionforcompactor.ModeRevision.compatible
embed.Config.CorsInfoin*cors.CORSInfotype toembed.Config.CORSinmap[string]struct{}type.not used
embed.Config.SetupLogging.Now logger is set up automatically based onembed.Config.Logger,embed.Config.LogOutputs,embed.Config.Debugfields.will let test meet the panic problem, fixed.
embed.Config.Loggerto support structured loggerzapin server-side.only use
zapin test.embed.Config.SnapCountfield toembed.Config.SnapshotCount, to be consistent with the flag nameetcd --snapshot-count.not used
embed.Config.LogOutputtoembed.Config.LogOutputsto support multiple log outputs.compatible
embed.Config.LogOutputstype fromstringto[]stringto support multiple log outputs.compatible
raft.Config.CheckQuorumwhen starting withForceNewCluster.If new members are added to standalone node with
CheckQuorum == falseand the standalone node is the leader, this may reduce cluster availabilities, since the leader won't check quorum activities.