Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

raft: remove atomicInt

Browse Source
This commit is contained in:
Blake Mizerany 2014-08-23 17:40:25 -07:00 committed by Yicheng Qin
parent 75dce35a5d
commit dd7aa95379
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
raft2/raft.go
View File

@ -4,7 +4,6 @@ import (
"errors"
"fmt"
"sort"
"sync/atomic"
)
const none = -1
@ -101,17 +100,6 @@ func (pr *progress) String() string {
return fmt.Sprintf("n=%d m=%d", pr.next, pr.match)
}
// An AtomicInt is an int64 to be accessed atomically.
type atomicInt int64
func (i *atomicInt) Set(n int64) {
atomic.StoreInt64((*int64)(i), n)
}
func (i *atomicInt) Get() int64 {
return atomic.LoadInt64((*int64)(i))
}
// int64Slice implements sort interface
type int64Slice []int64
@ -125,7 +113,7 @@ type raft struct {
id int64
// the term we are participating in at any time
index atomicInt
index int64
// the log
raftLog *raftLog
@ -139,7 +127,7 @@ type raft struct {
msgs []Message
// the leader id
lead atomicInt
lead int64
// pending reconfiguration
pendingConf bool
@ -273,7 +261,7 @@ func (r *raft) nextEnts() (ents []Entry) {
func (r *raft) reset(term int64) {
r.Term = term
r.lead.Set(none)
r.lead = none
r.Vote = none
r.votes = make(map[int64]bool)
for i := range r.prs {
@ -298,7 +286,7 @@ func (r *raft) appendEntry(e Entry) {
func (r *raft) becomeFollower(term int64, lead int64) {
r.reset(term)
r.lead.Set(lead)
r.lead = lead
r.state = stateFollower
r.pendingConf = false
}
@ -319,7 +307,7 @@ func (r *raft) becomeLeader() {
panic("invalid transition [follower -> leader]")
}
r.reset(r.Term)
r.lead.Set(r.id)
r.lead = r.id
r.state = stateLeader
for _, e := range r.raftLog.entries(r.raftLog.committed + 1) {
@ -464,13 +452,13 @@ func stepCandidate(r *raft, m Message) {
func stepFollower(r *raft, m Message) {
switch m.Type {
case msgProp:
if r.lead.Get() == none {
if r.lead == none {
panic("no leader")
}
m.To = r.lead.Get()
m.To = r.lead
r.send(m)
case msgApp:
r.lead.Set(m.From)
r.lead = m.From
r.handleAppendEntries(m)
case msgSnap:
r.handleSnapshot(m)

6
raft2/raft_test.go
View File

@ -605,7 +605,7 @@ func TestStateTransition(t *testing.T) {
if sm.Term != tt.wterm {
t.Errorf("%d: term = %d, want %d", i, sm.Term, tt.wterm)
}
if sm.lead.Get() != tt.wlead {
if sm.lead != tt.wlead {
t.Errorf("%d: lead = %d, want %d", i, sm.lead, tt.wlead)
}
}()
@ -709,8 +709,8 @@ func TestAllServerStepdown(t *testing.T) {
if msgType == msgVote {
wlead = none
}
if sm.lead.Get() != wlead {
t.Errorf("#%d, sm.lead = %d, want %d", i, sm.lead.Get(), none)
if sm.lead != wlead {
t.Errorf("#%d, sm.lead = %d, want %d", i, sm.lead, none)
}
}
}