Skip to content

Commit

Permalink
Merge pull request etcd-io#17618 from Akiqqqqqqq/feature-wal-write-me…
Browse files Browse the repository at this point in the history
…tric

feat: add wal write system call metrics observation (main)
  • Loading branch information
ahrtr committed Mar 31, 2024
2 parents caca515 + 97efc2a commit cc32fa8
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 14 deletions.
39 changes: 25 additions & 14 deletions server/storage/wal/encoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"io"
"os"
"sync"
"time"

"go.etcd.io/etcd/pkg/v3/crc"
"go.etcd.io/etcd/pkg/v3/ioutil"
Expand Down Expand Up @@ -84,17 +85,9 @@ func (e *encoder) encode(rec *walpb.Record) error {
data = e.buf[:n]
}

lenField, padBytes := encodeFrameSize(len(data))
if err = writeUint64(e.bw, lenField, e.uint64buf); err != nil {
return err
}
data, lenField := prepareDataWithPadding(data)

if padBytes != 0 {
data = append(data, make([]byte, padBytes)...)
}
n, err = e.bw.Write(data)
walWriteBytes.Add(float64(n))
return err
return write(e.bw, e.uint64buf, data, lenField)
}

func encodeFrameSize(dataBytes int) (lenField uint64, padBytes int) {
Expand All @@ -113,10 +106,28 @@ func (e *encoder) flush() error {
return e.bw.Flush()
}

func writeUint64(w io.Writer, n uint64, buf []byte) error {
// http://golang.org/src/encoding/binary/binary.go
binary.LittleEndian.PutUint64(buf, n)
nv, err := w.Write(buf)
func prepareDataWithPadding(data []byte) ([]byte, uint64) {
lenField, padBytes := encodeFrameSize(len(data))
if padBytes != 0 {
data = append(data, make([]byte, padBytes)...)
}
return data, lenField
}

func write(w io.Writer, uint64buf, data []byte, lenField uint64) error {
// write padding info
binary.LittleEndian.PutUint64(uint64buf, lenField)

start := time.Now()
nv, err := w.Write(uint64buf)
walWriteBytes.Add(float64(nv))
if err != nil {
return err
}

// write the record with padding
n, err := w.Write(data)
walWriteSec.Observe(time.Since(start).Seconds())
walWriteBytes.Add(float64(n))
return err
}
9 changes: 9 additions & 0 deletions server/storage/wal/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ var (
Buckets: prometheus.ExponentialBuckets(0.001, 2, 14),
})

walWriteSec = prometheus.NewHistogram(prometheus.HistogramOpts{
Namespace: "etcd",
Subsystem: "disk",
Name: "wal_write_duration_seconds",
Help: "The latency distributions of write called by WAL.",

Buckets: prometheus.ExponentialBuckets(0.001, 2, 14),
})

walWriteBytes = prometheus.NewGauge(prometheus.GaugeOpts{
Namespace: "etcd",
Subsystem: "disk",
Expand Down

0 comments on commit cc32fa8

Please sign in to comment.