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

server: fix epoch compile. #47

Merged
merged 1 commit into from
Mar 28, 2016
Merged

server: fix epoch compile. #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions server/cluster_worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,16 +400,16 @@ func (c *raftCluster) HandleAskChangePeer(request *pdpb.AskChangePeerRequest) er
changePeer := &raft_cmdpb.AdminRequest{
CmdType: raft_cmdpb.AdminCmdType_ChangePeer.Enum(),
ChangePeer: &raft_cmdpb.ChangePeerRequest{
ChangeType: changeType.Enum(),
Peer: peer,
RegionEpoch: region.RegionEpoch,
ChangeType: changeType.Enum(),
Peer: peer,
},
}

req := &raft_cmdpb.RaftCmdRequest{
Header: &raft_cmdpb.RaftRequestHeader{
RegionId: proto.Uint64(regionID),
Peer: request.Leader,
RegionId: proto.Uint64(regionID),
Peer: request.Leader,
RegionEpoch: region.RegionEpoch,
},
AdminRequest: changePeer,
}
Expand Down Expand Up @@ -456,10 +456,9 @@ func (c *raftCluster) checkChangePeerOK(request *raft_cmdpb.RaftCmdRequest) (*ra
return nil, errors.Trace(err)
}

changePeer := request.AdminRequest.ChangePeer
// If leader's conf version has changed, we can think ChangePeerOK,
// else we can think the raft server doesn't execute this change peer command.
if detail.Region.RegionEpoch.GetConfVer() > changePeer.RegionEpoch.GetConfVer() {
if detail.Region.RegionEpoch.GetConfVer() > request.Header.RegionEpoch.GetConfVer() {
return &raft_cmdpb.AdminResponse{
CmdType: raft_cmdpb.AdminCmdType_ChangePeer.Enum(),
ChangePeer: &raft_cmdpb.ChangePeerResponse{
Expand Down Expand Up @@ -490,14 +489,14 @@ func (c *raftCluster) HandleAskSplit(request *pdpb.AskSplitRequest) error {
NewRegionId: proto.Uint64(newRegionID),
NewPeerIds: peerIDs,
SplitKey: request.SplitKey,
RegionEpoch: request.Region.RegionEpoch,
},
}

req := &raft_cmdpb.RaftCmdRequest{
Header: &raft_cmdpb.RaftRequestHeader{
RegionId: request.Region.RegionId,
Peer: request.Leader,
RegionId: request.Region.RegionId,
Peer: request.Leader,
RegionEpoch: request.Region.RegionEpoch,
},
AdminRequest: split,
}
Expand Down Expand Up @@ -574,7 +573,7 @@ func (c *raftCluster) checkSplitOK(request *raft_cmdpb.RaftCmdRequest) (*raft_cm

// If leader's version has changed, we can think SplitOK,
// else we can think the raft server doesn't execute this split command.
if leftDetail.Region.RegionEpoch.GetVersion() <= split.RegionEpoch.GetVersion() {
if leftDetail.Region.RegionEpoch.GetVersion() <= request.Header.RegionEpoch.GetVersion() {
return nil, nil
}

Expand Down
8 changes: 4 additions & 4 deletions server/cluster_worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,9 +451,9 @@ func (s *mockRaftStore) handleChangePeer(c *C, req *raft_cmdpb.RaftCmdRequest) *
region := raftPeer.region
c.Assert(region.GetRegionId(), Equals, req.Header.GetRegionId())

if region.RegionEpoch.GetConfVer() > changePeer.RegionEpoch.GetConfVer() {
if region.RegionEpoch.GetConfVer() > req.Header.RegionEpoch.GetConfVer() {
return newErrorCmdResponse(errors.Errorf("stale message with epoch %v < %v",
region.RegionEpoch, changePeer.RegionEpoch))
region.RegionEpoch, req.Header.RegionEpoch))
}

if confType == raftpb.ConfChangeType_AddNode {
Expand Down Expand Up @@ -510,9 +510,9 @@ func (s *mockRaftStore) handleSplit(c *C, req *raft_cmdpb.RaftCmdRequest) *raft_
c.Assert(newPeerIDs, HasLen, len(region.Peers))

version := region.RegionEpoch.GetVersion()
if version > split.RegionEpoch.GetVersion() {
if version > req.Header.RegionEpoch.GetVersion() {
return newErrorCmdResponse(errors.Errorf("stale message with epoch %v < %v",
region.RegionEpoch, split.RegionEpoch))
region.RegionEpoch, req.Header.RegionEpoch))
}

if bytes.Equal(splitKey, region.GetEndKey()) {
Expand Down