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: fixed some typos and simplify minor logic

Browse Source
This commit is contained in:
Wine93 2019-08-23 01:44:49 +00:00 committed by Gyuho Lee
parent 61d6efda4c
commit 9c850ccef0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
raft/log_test.go
View File

@ -265,7 +265,7 @@ func TestLogMaybeAppend(t *testing.T) {
t.Fatalf("unexpected error %v", err) t.Fatalf("unexpected error %v", err)
} }
if !reflect.DeepEqual(tt.ents, gents) { if !reflect.DeepEqual(tt.ents, gents) {
t.Errorf("%d: appended entries = %v, want %v", i, gents, tt.ents) t.Errorf("#%d: appended entries = %v, want %v", i, gents, tt.ents)
} }
} }
}() }()
@ -671,13 +671,13 @@ func TestIsOutOfBounds(t *testing.T) {
}() }()
err := l.mustCheckOutOfBounds(tt.lo, tt.hi) err := l.mustCheckOutOfBounds(tt.lo, tt.hi)
if tt.wpanic { if tt.wpanic {
t.Errorf("%d: panic = %v, want %v", i, false, true) t.Errorf("#%d: panic = %v, want %v", i, false, true)
} }
if tt.wErrCompacted && err != ErrCompacted { if tt.wErrCompacted && err != ErrCompacted {
t.Errorf("%d: err = %v, want %v", i, err, ErrCompacted) t.Errorf("#%d: err = %v, want %v", i, err, ErrCompacted)
} }
if !tt.wErrCompacted && err != nil { if !tt.wErrCompacted && err != nil {
t.Errorf("%d: unexpected err %v", i, err) t.Errorf("#%d: unexpected err %v", i, err)
} }
}() }()
} }

4
raft/raft.go
View File

@ -367,7 +367,7 @@ func newRaft(c *Config) *raft {
} }
assertConfStatesEquivalent(r.logger, cs, r.switchToConfig(cfg, prs)) assertConfStatesEquivalent(r.logger, cs, r.switchToConfig(cfg, prs))
if !isHardStateEqual(hs, emptyState) { if !IsEmptyHardState(hs) {
r.loadState(hs) r.loadState(hs)
} }
if c.Applied > 0 { if c.Applied > 0 {
@ -1099,7 +1099,7 @@ func stepLeader(r *raft, m pb.Message) error {
case ReadOnlyLeaseBased: case ReadOnlyLeaseBased:
ri := r.raftLog.committed ri := r.raftLog.committed
if m.From == None || m.From == r.id { // from local member if m.From == None || m.From == r.id { // from local member
r.readStates = append(r.readStates, ReadState{Index: r.raftLog.committed, RequestCtx: m.Entries[0].Data}) r.readStates = append(r.readStates, ReadState{Index: ri, RequestCtx: m.Entries[0].Data})
} else { } else {
r.send(pb.Message{To: m.From, Type: pb.MsgReadIndexResp, Index: ri, Entries: m.Entries}) r.send(pb.Message{To: m.From, Type: pb.MsgReadIndexResp, Index: ri, Entries: m.Entries})
} }

4
raft/storage_test.go
View File

@ -106,7 +106,7 @@ func TestStorageLastIndex(t *testing.T) {
t.Errorf("err = %v, want nil", err) t.Errorf("err = %v, want nil", err)
} }
if last != 5 { if last != 5 {
t.Errorf("term = %d, want %d", last, 5) t.Errorf("last = %d, want %d", last, 5)
} }
s.Append([]pb.Entry{{Index: 6, Term: 5}}) s.Append([]pb.Entry{{Index: 6, Term: 5}})
@ -115,7 +115,7 @@ func TestStorageLastIndex(t *testing.T) {
t.Errorf("err = %v, want nil", err) t.Errorf("err = %v, want nil", err)
} }
if last != 6 { if last != 6 {
t.Errorf("last = %d, want %d", last, 5) t.Errorf("last = %d, want %d", last, 6)
} }
} }