From 0c37df72653b4ed7727d10c54d4e80dbfd31b239 Mon Sep 17 00:00:00 2001
From: Gyu-Ho Lee <gyuhox@gmail.com>
Date: Mon, 22 Aug 2016 22:58:44 -0700
Subject: [PATCH] etcd-tester: fix compact rev counting

---
 tools/functional-tester/etcd-tester/tester.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/functional-tester/etcd-tester/tester.go b/tools/functional-tester/etcd-tester/tester.go
index c00167376..0fc71f128 100644
--- a/tools/functional-tester/etcd-tester/tester.go
+++ b/tools/functional-tester/etcd-tester/tester.go
@@ -50,6 +50,7 @@ func (tt *tester) runLoop() {
 			if err != nil || tt.cleanup() != nil {
 				return
 			}
+			prevCompactRev = 0 // reset after clean up
 			continue
 		}
 		// -1 so that logPrefix doesn't print out 'case'
@@ -58,7 +59,7 @@ func (tt *tester) runLoop() {
 		revToCompact := max(0, tt.currentRevision-10000)
 		compactN := revToCompact - prevCompactRev
 		timeout := 10 * time.Second
-		if prevCompactRev != 0 && compactN > 0 {
+		if compactN > 0 {
 			timeout += time.Duration(compactN/compactQPS) * time.Second
 		}
 		prevCompactRev = revToCompact
@@ -69,6 +70,7 @@ func (tt *tester) runLoop() {
 			if err := tt.cleanup(); err != nil {
 				return
 			}
+			prevCompactRev = 0 // reset after clean up
 		}
 		if round > 0 && round%500 == 0 { // every 500 rounds
 			if err := tt.defrag(); err != nil {