server: use same initialcluster config to restart joined member #1279
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
changed the title
disksing
reviewed
Oct 19, 2018
server/join.go
Outdated
| @@ -73,8 +83,20 @@ func PrepareJoinCluster(cfg *Config) error { | |||
| return errors.New("join self is forbidden") | |||
| } | |||
|
|
|||
| // Cases with data directory. | |||
| filePath := cfg.DataDir + "/join" | |||
There was a problem hiding this comment.
Suggested change
| filePath := cfg.DataDir + "/join" | |
| filePath := filepath.Join(cfg.DataDir, "join") |
disksing
approved these changes
Oct 22, 2018
disksing
approved these changes
Oct 22, 2018
disksing
approved these changes
Oct 22, 2018
disksing
approved these changes
Oct 22, 2018
rleungx
reviewed
Oct 23, 2018
server/join.go
Outdated
| @@ -138,7 +161,20 @@ func PrepareJoinCluster(cfg *Config) error { | |||
| initialCluster = strings.Join(pds, ",") | |||
| cfg.InitialCluster = initialCluster | |||
| cfg.InitialClusterState = embed.ClusterStateFlagExisting | |||
| return nil | |||
| err = os.Mkdir(cfg.DataDir, privateDirMode) | |||
There was a problem hiding this comment.
Do we need to use MkdirAll here?
|
PTAL |
disksing
reviewed
Oct 23, 2018
server/join.go
Outdated
| @@ -103,6 +126,9 @@ func PrepareJoinCluster(cfg *Config) error { | |||
|
|
|||
| existed := false | |||
| for _, m := range listResp.Members { | |||
| if len(m.Name) == 0 { | |||
| return errors.New("exsist a member that the join is not completed") | |||
There was a problem hiding this comment.
How about there is a member that has not been joined successfully?
PTAL @CaitinChen
There was a problem hiding this comment.
@disksing there is a member that has not joined successfully
disksing
reviewed
Oct 23, 2018
server/join.go
Outdated
| return nil | ||
| err = os.MkdirAll(cfg.DataDir, privateDirMode) | ||
| if err != nil && !os.IsExist(err) { | ||
| return err |
server/join.go
Outdated
| return err | ||
| } | ||
|
|
||
| for i := 0; i < retryTimes; i++ { |
There was a problem hiding this comment.
Maybe we don't need to retry. It's ok to exit directly.
server/join.go
Outdated
| } | ||
| break | ||
| } | ||
| return err |
disksing
approved these changes
Oct 23, 2018
nolouch
changed the title
rleungx
reviewed
Oct 24, 2018
rleungx
approved these changes
Oct 24, 2018
|
@disksing are there any plans to put this into the next RC (assuming there is one)? This issue shows up frequently in our DinD setup, so we could also use this to produce a docker image specifically for that setup. |
|
I think we can include it in RC5. /cc @nolouch |
nolouch
added
the
needs-cherry-pick-release-2.1
nolouch
added a commit
to nolouch/pd
that referenced
this pull request
Nov 12, 2018
nolouch
added a commit
that referenced
this pull request
Nov 12, 2018
Merged
nolouch
added
the
needs-cherry-pick-release-2.0
disksing
pushed a commit
to oh-my-tidb/pd
that referenced
this pull request
Nov 14, 2018
disksing
added a commit
that referenced
this pull request
Nov 14, 2018
* server, client: fix hanging problem when etcd failed to start (#1267) * server: use same initialcluster config to restart joined member (#1279) * fix server build * pdctl: cherry pick bugfixes (#1298, #1299, #1308) * server/api: fix the issue about `regions/check` API (#1311) * fix join build * fix pdctl build * fix region test * fix warnings
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.
What problem does this PR solve?
detail in: pingcap/tidb-operator#126
because some problem in etcd when joining a member. it may prepare to join failed. and we dynamically generate the join config for join member. and that's may cause the problem:
What is changed and how it works?
use the same join config after join success.
Check List
Tests