mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
raft: add first level logging
We log the message to step and the state of the statemachine before and after stepping the message.
This commit is contained in:
parent
d7eef6a64e
commit
c7d1beaaa5
@ -44,6 +44,10 @@ func newLog() *log {
|
||||
}
|
||||
}
|
||||
|
||||
func (l *log) String() string {
|
||||
return fmt.Sprintf("offset=%d committed=%d applied=%d len(ents)=%d", l.offset, l.committed, l.applied, len(l.ents))
|
||||
}
|
||||
|
||||
func (l *log) maybeAppend(index, logTerm, committed int64, ents ...Entry) bool {
|
||||
if l.matchTerm(index, logTerm) {
|
||||
from := index + 1
|
||||
|
30
raft/raft.go
30
raft/raft.go
@ -2,6 +2,8 @@ package raft
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
golog "log"
|
||||
"sort"
|
||||
"sync/atomic"
|
||||
)
|
||||
@ -78,6 +80,11 @@ type Message struct {
|
||||
Snapshot Snapshot
|
||||
}
|
||||
|
||||
func (m Message) String() string {
|
||||
return fmt.Sprintf("type=%v from=%x to=%x term=%d logTerm=%d i=%d ci=%d len(ents)=%d",
|
||||
m.Type, m.From, m.To, m.Term, m.LogTerm, m.Index, m.Commit, len(m.Entries))
|
||||
}
|
||||
|
||||
type index struct {
|
||||
match, next int64
|
||||
}
|
||||
@ -93,6 +100,10 @@ func (in *index) decr() {
|
||||
}
|
||||
}
|
||||
|
||||
func (in *index) String() string {
|
||||
return fmt.Sprintf("n=%d m=%d", in.next, in.match)
|
||||
}
|
||||
|
||||
// An AtomicInt is an int64 to be accessed atomically.
|
||||
type atomicInt int64
|
||||
|
||||
@ -154,6 +165,19 @@ func newStateMachine(id int64, peers []int64) *stateMachine {
|
||||
return sm
|
||||
}
|
||||
|
||||
func (sm *stateMachine) String() string {
|
||||
s := fmt.Sprintf(`state=%v term=%d`, sm.state, sm.term)
|
||||
switch sm.state {
|
||||
case stateFollower:
|
||||
s += fmt.Sprintf(" vote=%v lead=%v", sm.vote, sm.lead)
|
||||
case stateCandidate:
|
||||
s += fmt.Sprintf(` votes="%v"`, sm.votes)
|
||||
case stateLeader:
|
||||
s += fmt.Sprintf(` ins="%v"`, sm.ins)
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
func (sm *stateMachine) setSnapshoter(snapshoter Snapshoter) {
|
||||
sm.snapshoter = snapshoter
|
||||
}
|
||||
@ -175,6 +199,7 @@ func (sm *stateMachine) send(m Message) {
|
||||
m.ClusterId = sm.clusterId
|
||||
m.From = sm.id
|
||||
m.Term = sm.term.Get()
|
||||
golog.Printf("raft.send msg %v\n", m)
|
||||
sm.msgs = append(sm.msgs, m)
|
||||
}
|
||||
|
||||
@ -321,6 +346,11 @@ func (sm *stateMachine) Msgs() []Message {
|
||||
}
|
||||
|
||||
func (sm *stateMachine) Step(m Message) (ok bool) {
|
||||
golog.Printf("raft.step beforeState %v\n", sm)
|
||||
golog.Printf("raft.step beforeLog %v\n", sm.log)
|
||||
defer golog.Printf("raft.step afterLog %v\n", sm.log)
|
||||
defer golog.Printf("raft.step afterState %v\n", sm)
|
||||
golog.Printf("raft.step msg %v\n", m)
|
||||
if m.Type == msgHup {
|
||||
sm.becomeCandidate()
|
||||
if sm.q() == sm.poll(sm.id, true) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user