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.

Sign up for GitHub

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

Jump to bottom

updated error comments and appropriate parameters #260

Open
wants to merge 2 commits into
base: course
Choose a base branch
from
Open

updated error comments and appropriate parameters #260

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fac2cb
updated error comments and appropriate parameters
lorettax May 14, 2021
42603af
Merge branch 'course' into lorettax
lorettax May 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions kv/raftstore/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func BootstrapStore(engines *engine_util.Engines, clusterID, storeID uint64) err
return err
}
if !empty {
return errors.New("kv store is not empty and ahs alread had data.")
return errors.New("kv store is not empty and has already had data.")
}
empty, err = isRangeEmpty(engines.Raft, meta.MinKey, meta.MaxKey)
if err != nil {
Expand All @@ -62,7 +62,7 @@ func BootstrapStore(engines *engine_util.Engines, clusterID, storeID uint64) err
return nil
}

func PrepareBootstrap(engins *engine_util.Engines, storeID, regionID, peerID uint64) (*metapb.Region, error) {
func PrepareBootstrap(engines *engine_util.Engines, storeID, regionID, peerID uint64) (*metapb.Region, error) {
region := &metapb.Region{
Id: regionID,
StartKey: []byte{},
Expand All @@ -78,7 +78,7 @@ func PrepareBootstrap(engins *engine_util.Engines, storeID, regionID, peerID uin
},
},
}
err := PrepareBootstrapCluster(engins, region)
err := PrepareBootstrapCluster(engines, region)
if err != nil {
return nil, err
}
Expand Down