From 044f7775e306f10917e72c34cd258061971bf111 Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Fri, 5 Feb 2016 16:25:25 -0800
Subject: [PATCH] etcd-tester: log cancel in stresser

And fix some minor print formats.
---
 tools/functional-tester/etcd-tester/stresser.go | 3 ++-
 tools/functional-tester/etcd-tester/tester.go   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/functional-tester/etcd-tester/stresser.go b/tools/functional-tester/etcd-tester/stresser.go
index 205188b50..c5d8a4225 100644
--- a/tools/functional-tester/etcd-tester/stresser.go
+++ b/tools/functional-tester/etcd-tester/stresser.go
@@ -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()
diff --git a/tools/functional-tester/etcd-tester/tester.go b/tools/functional-tester/etcd-tester/tester.go
index ed18e1b9b..66b3aaba6 100644
--- a/tools/functional-tester/etcd-tester/tester.go
+++ b/tools/functional-tester/etcd-tester/tester.go
@@ -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 {