mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
etcdserver: add more detailed traces on linearized reading (#12335)
To improve debuggability of `agreement among raft nodes before linearized reading`, we added some tracing inside `linearizableReadLoop`. This will allow us to know the timing of `s.r.ReadIndex` vs `s.applyWait.Wait(rs.Index)`.
This commit is contained in:
@@ -19,6 +19,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/etcd/v3/auth"
|
"go.etcd.io/etcd/v3/auth"
|
||||||
@@ -718,6 +719,9 @@ func (s *EtcdServer) linearizableReadLoop() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// as a single loop is can unlock multiple reads, it is not very useful
|
||||||
|
// to propagate the trace from Txn or Range.
|
||||||
|
trace := traceutil.New("linearizableReadLoop", s.getLogger())
|
||||||
nextnr := newNotifier()
|
nextnr := newNotifier()
|
||||||
|
|
||||||
s.readMu.Lock()
|
s.readMu.Lock()
|
||||||
@@ -778,16 +782,26 @@ func (s *EtcdServer) linearizableReadLoop() {
|
|||||||
if !done {
|
if !done {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
trace.Step("read index received")
|
||||||
|
|
||||||
if ai := s.getAppliedIndex(); ai < rs.Index {
|
index := rs.Index
|
||||||
|
trace.AddField(traceutil.Field{Key: "readStateIndex", Value: index})
|
||||||
|
|
||||||
|
ai := s.getAppliedIndex()
|
||||||
|
trace.AddField(traceutil.Field{Key: "appliedIndex", Value: strconv.FormatUint(ai, 10)})
|
||||||
|
|
||||||
|
if ai < index {
|
||||||
select {
|
select {
|
||||||
case <-s.applyWait.Wait(rs.Index):
|
case <-s.applyWait.Wait(index):
|
||||||
case <-s.stopping:
|
case <-s.stopping:
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// unblock all l-reads requested at indices before rs.Index
|
// unblock all l-reads requested at indices before rs.Index
|
||||||
nr.notify(nil)
|
nr.notify(nil)
|
||||||
|
trace.Step("applied index is now lower than readState.Index")
|
||||||
|
|
||||||
|
trace.LogAllStepsIfLong(traceThreshold)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -157,6 +157,13 @@ func (t *Trace) LogIfLong(threshold time.Duration) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// LogAllStepsIfLong dumps all logs if the duration is longer than threshold
|
||||||
|
func (t *Trace) LogAllStepsIfLong(threshold time.Duration) {
|
||||||
|
if time.Since(t.startTime) > threshold {
|
||||||
|
t.LogWithStepThreshold(0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// LogWithStepThreshold only dumps step whose duration is longer than step threshold
|
// LogWithStepThreshold only dumps step whose duration is longer than step threshold
|
||||||
func (t *Trace) LogWithStepThreshold(threshold time.Duration) {
|
func (t *Trace) LogWithStepThreshold(threshold time.Duration) {
|
||||||
msg, fs := t.logInfo(threshold)
|
msg, fs := t.logInfo(threshold)
|
||||||
|
|||||||
Reference in New Issue
Block a user