Skip to content
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.

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

*: upgrade etcd to master #1101

Merged
merged 9 commits into from
Jun 7, 2018
Merged

*: upgrade etcd to master #1101

merged 9 commits into from
Jun 7, 2018

Conversation

nolouch
Copy link
Contributor

@nolouch nolouch commented Jun 4, 2018

Changes:

@nolouch nolouch changed the title *: upgrade etcd to v3.3.4 *: upgrade etcd to master Jun 4, 2018
@nolouch nolouch requested review from disksing and siddontang and removed request for disksing June 4, 2018 10:12
@nolouch
Copy link
Contributor Author

nolouch commented Jun 4, 2018

/run-all-tests

server/join.go Outdated
initialCluster := ""
if wal.Exist(path.Join(cfg.DataDir, "member")) {
if wal.Exist(path.Join(cfg.DataDir, "member/wal")) {
Copy link
Contributor

Choose a reason for hiding this comment

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

oh, it breaks the compatibility?

Copy link
Contributor Author

@nolouch nolouch Jun 4, 2018

Choose a reason for hiding this comment

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

no, it's compatibility. but better to keep the previous logic. address it.

@@ -42,6 +42,8 @@ func newTestSingleConfig() *embed.Config {
cfg.Name = "test_etcd"
cfg.Dir, _ = ioutil.TempDir("/tmp", "test_etcd")
cfg.WalDir = ""
cfg.Logger = "zap"
Copy link
Contributor

Choose a reason for hiding this comment

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

do we use zap in production?

Copy link
Contributor Author

@nolouch nolouch Jun 4, 2018

Choose a reason for hiding this comment

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

etcd plan to use zap replace the capnslog logging. and we only enable it in the test.

@nolouch nolouch added the status/tests-passed The PR has passed all tests. label Jun 4, 2018
@nolouch nolouch requested review from disksing and removed request for disksing June 5, 2018 06:10
server/server.go Outdated
@@ -285,6 +285,16 @@ func (s *Server) Run() error {
return nil
}

// SetUpTestMode for testing
func (s *Server) SetUpTestMode() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we do it in server.CreateServer? It looks verbose to call it in every tests...

@disksing
Copy link
Contributor

disksing commented Jun 6, 2018

LGTM. PTAL @siddontang @Connor1996

Copy link
Member

@Connor1996 Connor1996 left a comment

Choose a reason for hiding this comment

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

LGTM

@nolouch
Copy link
Contributor Author

nolouch commented Jun 6, 2018

/run-all-tests

@nolouch nolouch merged commit 179604c into tikv:master Jun 7, 2018
@nolouch nolouch deleted the update-etcd branch June 7, 2018 03:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/tests-passed The PR has passed all tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants