Merge pull request #7586 from gyuho/timeout

tools/etcd-tester: add timeout for 'defrag'
This commit is contained in:
Gyu-Ho Lee 2017-03-23 10:23:42 -07:00 committed by GitHub
commit 0256953b28

View File

@ -79,7 +79,10 @@ func (m *member) Defrag() error {
return err
}
defer cli.Close()
if _, err = cli.Defragment(context.Background(), m.ClientURL); err != nil {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
_, err = cli.Defragment(ctx, m.ClientURL)
cancel()
if err != nil {
return err
}
plog.Printf("defragmented %s\n", m.ClientURL)