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 #5610 from gyuho/handle_timeout_error

Browse Source 
etcd-tester: do not exit for compaction timeout
This commit is contained in:
Gyu-Ho Lee 2016-06-10 09:47:54 -07:00 committed by GitHub
commit 05f9d1b716
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/functional-tester/etcd-tester/tester.go
View File

@ -128,8 +128,10 @@ func (tt *tester) runLoop() {
plog.Printf("%s compacting %d entries (timeout %v)", tt.logPrefix(), compactN, timeout)
if err := tt.compact(revToCompact, timeout); err != nil {
plog.Warningf("%s functional-tester returning with error (%v)", tt.logPrefix(), err)
return
plog.Warningf("%s functional-tester compact got error (%v)", tt.logPrefix(), err)
if err := tt.cleanup(); err != nil {
return
}
}
if round > 0 && round%500 == 0 { // every 500 rounds
if err := tt.defrag(); err != nil {
@ -263,7 +265,13 @@ func (tt *tester) cleanup() error {
plog.Printf("%s cleanup error: %v", tt.logPrefix(), err)
return err
}
return tt.cluster.Bootstrap()
if err := tt.cluster.Bootstrap(); err != nil {
plog.Printf("%s cleanup Bootstrap error: %v", tt.logPrefix(), err)
return err
}
return nil
}
func (tt *tester) cancelStressers() {