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 #9693 from mohitsoni/release-3.1

Browse Source 
Cherry-picking PR 7967 to release-3.1
This commit is contained in:
Gyuho Lee 2018-05-04 12:16:27 -07:00 committed by GitHub
commit 01d9b368a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etcdserver/server.go
View File

@ -588,18 +588,21 @@ func (s *EtcdServer) start() {
} }
func (s *EtcdServer) purgeFile() { func (s *EtcdServer) purgeFile() {
var serrc, werrc <-chan error var dberrc, serrc, werrc <-chan error
if s.Cfg.MaxSnapFiles > 0 { if s.Cfg.MaxSnapFiles > 0 {
dberrc = fileutil.PurgeFile(s.Cfg.SnapDir(), "snap.db", s.Cfg.MaxSnapFiles, purgeFileInterval, s.done)
serrc = fileutil.PurgeFile(s.Cfg.SnapDir(), "snap", s.Cfg.MaxSnapFiles, purgeFileInterval, s.done) serrc = fileutil.PurgeFile(s.Cfg.SnapDir(), "snap", s.Cfg.MaxSnapFiles, purgeFileInterval, s.done)
} }
if s.Cfg.MaxWALFiles > 0 { if s.Cfg.MaxWALFiles > 0 {
werrc = fileutil.PurgeFile(s.Cfg.WALDir(), "wal", s.Cfg.MaxWALFiles, purgeFileInterval, s.done) werrc = fileutil.PurgeFile(s.Cfg.WALDir(), "wal", s.Cfg.MaxWALFiles, purgeFileInterval, s.done)
} }
select { select {
case e := <-werrc: case e := <-dberrc:
plog.Fatalf("failed to purge wal file %v", e) plog.Fatalf("failed to purge snap db file %v", e)
case e := <-serrc: case e := <-serrc:
plog.Fatalf("failed to purge snap file %v", e) plog.Fatalf("failed to purge snap file %v", e)
case e := <-werrc:
plog.Fatalf("failed to purge wal file %v", e)
case <-s.stopping: case <-s.stopping:
return return
} }