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

Merged
merged 5 commits into from
Jul 30, 2020
Merged

Conversation

disksing
Copy link
Contributor

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: disksing <i@disksing.com>
Signed-off-by: disksing <i@disksing.com>
@disksing disksing added component/config Configuration logic. require-LGT1 Indicates that the PR requires an LGTM. labels Jul 29, 2020
Copy link
Member

@rleungx rleungx left a comment

Choose a reason for hiding this comment

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

The rest LGTM

@@ -25,6 +25,7 @@ import (
"go.uber.org/goleak"

// Register schedulers.
"github.com/pingcap/pd/v4/server/config"
Copy link
Member

Choose a reason for hiding this comment

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

The comment is used to describe line 29.

Signed-off-by: disksing <i@disksing.com>
@disksing disksing requested a review from rleungx July 29, 2020 09:47
Copy link
Contributor

@nolouch nolouch left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 30, 2020
@disksing
Copy link
Contributor Author

/merge

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

/run-all-tests

@ti-srebot
Copy link
Contributor

@disksing merge failed.

@disksing
Copy link
Contributor Author

/run-test

@disksing
Copy link
Contributor Author

/build

@disksing disksing merged commit dc8c75c into tikv:master Jul 30, 2020
@disksing disksing deleted the token branch July 30, 2020 09:30
@disksing disksing added the needs-cherry-pick-release-4.0 The PR needs to cherry pick to release-4.0 branch. label Sep 8, 2020
@disksing
Copy link
Contributor Author

disksing commented Sep 8, 2020

/run-cherry-picker

ti-srebot pushed a commit to ti-srebot/pd that referenced this pull request Sep 8, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #2922

disksing pushed a commit that referenced this pull request Sep 8, 2020
Signed-off-by: disksing <i@disksing.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/config Configuration logic. needs-cherry-pick-release-4.0 The PR needs to cherry pick to release-4.0 branch. 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.

Support configuring initial-cluster-token
4 participants