server/node: allow restart with a StoreIdent when cluster not boostrappped #4334
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
…ppped Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
overvenus
force-pushed
the
fix/bootstrap
branch
from
89613ac
to
5836b08
Compare
Signed-off-by: Neil Shen <overvenus@gmail.com>
This comment has been minimized.
This comment has been minimized.
overvenus
force-pushed
the
fix/bootstrap
branch
from
5836b08
to
b31192a
Compare
This comment has been minimized.
This comment has been minimized.
|
/run-integration-common-test |
Signed-off-by: Neil Shen <overvenus@gmail.com>
BusyJay
reviewed
Mar 11, 2019
src/raftstore/store/bootstrap.rs
Outdated
| @@ -155,10 +146,18 @@ mod tests { | |||
| ); | |||
| let engines = Engines::new(Arc::clone(&kv_engine), Arc::clone(&raft_engine)); | |||
|
|
|||
| let mut region = metapb::Region::new(); | |||
There was a problem hiding this comment.
You can use initial_region here too.
src/server/node.rs
Outdated
| .get_msg::<metapb::Region>(keys::PREPARE_BOOTSTRAP_KEY)?; | ||
| if res.is_none() { | ||
| return Ok(()); | ||
| .get_msg::<metapb::Region>(keys::PREPARE_BOOTSTRAP_KEY)? |
There was a problem hiding this comment.
Is the type hint really necessary?
| .unwrap(); | ||
| let store_id = ident.get_store_id(); | ||
| let sim = Arc::new(RwLock::new(NodeCluster::new(Arc::clone(&pd_client)))); | ||
| let mut cluster = Cluster::new(0, 5, sim, pd_client); |
| node.stop(); | ||
| fail::remove(fp); | ||
|
|
||
| let (_, system) = fsm::create_raft_batch_system(&cfg.raft_store); |
There was a problem hiding this comment.
Why not add a try_start function to cluster? So that you don't have to repeat the code here.
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: Neil Shen <overvenus@gmail.com>
overvenus
force-pushed
the
fix/bootstrap
branch
from
2bf1529
to
2338765
Compare
Signed-off-by: Neil Shen <overvenus@gmail.com>
|
/run-all-tests |
BusyJay
approved these changes
Mar 12, 2019
nolouch
approved these changes
Mar 13, 2019
sticnarf
pushed a commit
to sticnarf/tikv
that referenced
this pull request
Oct 27, 2019
…ppped (tikv#4334) Signed-off-by: Neil Shen <overvenus@gmail.com>
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 have you changed? (mandatory)
Allow restart TiKV with a StoreIdent when the cluster is not bootstrapped.
What are the type of the changes? (mandatory)
How has this PR been tested? (mandatory)
Integration test.
Does this PR affect documentation (docs) update? (mandatory)
No.
Does this PR affect tidb-ansible update? (mandatory)
No.
Refer to a related PR or issue link (optional)
Close #4333