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

Merge pull request #14506 from SimFG/main

Browse Source 
wal: Fix the `walWriteBytes` metric
This commit is contained in:
Benjamin Wang 2022-09-26 09:36:07 +08:00 committed by GitHub
commit 434c7c4309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/ioutil/pagewriter.go
View File

@ -104,11 +104,6 @@ func (pw *PageWriter) Flush() error {
return err return err
} }
// FlushN flushes buffered data and returns the number of written bytes.
func (pw *PageWriter) FlushN() (int, error) {
return pw.flush()
}
func (pw *PageWriter) flush() (int, error) { func (pw *PageWriter) flush() (int, error) {
if pw.bufferedBytes == 0 { if pw.bufferedBytes == 0 {
return 0, nil return 0, nil

6
server/storage/wal/encoder.go
View File

@ -109,10 +109,8 @@ func encodeFrameSize(dataBytes int) (lenField uint64, padBytes int) {
func (e *encoder) flush() error { func (e *encoder) flush() error {
e.mu.Lock() e.mu.Lock()
n, err := e.bw.FlushN() defer e.mu.Unlock()
e.mu.Unlock() return e.bw.Flush()
walWriteBytes.Add(float64(n))
return err
} }
func writeUint64(w io.Writer, n uint64, buf []byte) error { func writeUint64(w io.Writer, n uint64, buf []byte) error {