Merge pull request #4445 from gyuho/func

etcd-tester: log cancel in stresser
This commit is contained in:
Gyu-Ho Lee 2016-02-05 18:47:42 -08:00
commit 6d12bf4951
2 changed files with 4 additions and 3 deletions

View File

@ -78,7 +78,8 @@ func (s *stresser) Stress() error {
Value: []byte(randStr(s.KeySize)),
})
putcancel()
if err == context.Canceled {
if grpc.ErrorDesc(err) == context.Canceled.Error() {
log.Printf("etcd-tester: stresser#%d is cancelled", i)
return
}
s.mu.Lock()

View File

@ -98,10 +98,10 @@ func (tt *tester) runLoop() {
continue
}
if ok = isSameValueInMap(revs); ok {
log.Printf("etcd-tester: [round#%d case#%d] checking current revisions succeed!", i, j)
log.Printf("etcd-tester: [round#%d case#%d.%d] checking current revisions succeed!", i, j, k)
break
} else {
log.Printf("etcd-tester: [round#%d case#%d] current revisions %+v", i, j, revs)
log.Printf("etcd-tester: [round#%d case#%d.%d] current revisions %+v", i, j, k, revs)
}
}
if !ok {