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

config: add initial-cluster-token config (#2691) #2922

Merged
merged 2 commits into from
Sep 8, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #2691 to release-4.0


What problem does this PR solve?

Fix #2689

What is changed and how it works?

Add config, pass it to etcd.

Check List

Tests

  • Unit test
  • Manual test (add detailed scripts or steps below)
- start cluster with the same config, the cluster ids are the same
- start cluster with different token, the cluster ids are different

Code changes

  • Has configuration change

Related changes

Release note

  • Add initial-cluster-token configuration to avoid different clusters communicate during bootstrap

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added component/config Configuration logic. require-LGT1 Indicates that the PR requires an LGTM. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick labels Sep 8, 2020
@ti-srebot ti-srebot added this to the v4.0.6 milestone Sep 8, 2020
Signed-off-by: disksing <i@disksing.com>
Copy link
Contributor

@Yisaer Yisaer left a comment

Choose a reason for hiding this comment

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

LGTM

@disksing
Copy link
Contributor

disksing commented Sep 8, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 8, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 8, 2020

/run-integration-lightning-test

@disksing disksing merged commit a9feb83 into tikv:release-4.0 Sep 8, 2020
@disksing disksing deleted the release-4.0-dc8c75cf7ca0 branch September 8, 2020 05:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/config Configuration logic. require-LGT1 Indicates that the PR requires an LGTM. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants