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 #14576 from ahrtr/wal_log

Browse Source 
etcdserver: added more debug log for the purgeFile goroutine
This commit is contained in:
Benjamin Wang 2022-10-12 19:22:53 +08:00 committed by GitHub
commit 81dfc4be9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/pkg/fileutil/purge.go
View File

@ -41,6 +41,12 @@ func purgeFile(lg *zap.Logger, dirname string, suffix string, max uint, interval
lg = zap.NewNop() lg = zap.NewNop()
} }
errC := make(chan error, 1) errC := make(chan error, 1)
lg.Info("started to purge file",
zap.String("dir", dirname),
zap.String("suffix", suffix),
zap.Uint("max", max),
zap.Duration("interval", interval))
go func() { go func() {
if donec != nil { if donec != nil {
defer close(donec) defer close(donec)
@ -63,14 +69,16 @@ func purgeFile(lg *zap.Logger, dirname string, suffix string, max uint, interval
f := filepath.Join(dirname, newfnames[0]) f := filepath.Join(dirname, newfnames[0])
l, err := TryLockFile(f, os.O_WRONLY, PrivateFileMode) l, err := TryLockFile(f, os.O_WRONLY, PrivateFileMode)
if err != nil { if err != nil {
lg.Warn("failed to lock file", zap.String("path", f), zap.Error(err))
break break
} }
if err = os.Remove(f); err != nil { if err = os.Remove(f); err != nil {
lg.Error("failed to remove file", zap.String("path", f), zap.Error(err))
errC <- err errC <- err
return return
} }
if err = l.Close(); err != nil { if err = l.Close(); err != nil {
lg.Warn("failed to unlock/close", zap.String("path", l.Name()), zap.Error(err)) lg.Error("failed to unlock/close", zap.String("path", l.Name()), zap.Error(err))
errC <- err errC <- err
return return
} }

2
server/embed/etcd.go
View File

@ -328,6 +328,8 @@ func print(lg *zap.Logger, ec Config, sc config.ServerConfig, memberInitialized
zap.String("wait-cluster-ready-timeout", sc.WaitClusterReadyTimeout.String()), zap.String("wait-cluster-ready-timeout", sc.WaitClusterReadyTimeout.String()),
zap.Bool("initial-election-tick-advance", sc.InitialElectionTickAdvance), zap.Bool("initial-election-tick-advance", sc.InitialElectionTickAdvance),
zap.Uint64("snapshot-count", sc.SnapshotCount), zap.Uint64("snapshot-count", sc.SnapshotCount),
zap.Uint("max-wals", sc.MaxWALFiles),
zap.Uint("max-snapshots", sc.MaxSnapFiles),
zap.Uint64("snapshot-catchup-entries", sc.SnapshotCatchUpEntries), zap.Uint64("snapshot-catchup-entries", sc.SnapshotCatchUpEntries),
zap.Strings("initial-advertise-peer-urls", ec.getAPURLs()), zap.Strings("initial-advertise-peer-urls", ec.getAPURLs()),
zap.Strings("listen-peer-urls", ec.getLPURLs()), zap.Strings("listen-peer-urls", ec.getLPURLs()),