From 49c5c3308c2a331a59dbcd2f2b57e3ee59d2a87f Mon Sep 17 00:00:00 2001
From: Vijay Pai <vpai@google.com>
Date: Mon, 22 Feb 2016 21:44:33 -0800
Subject: [PATCH] Some more cleanup on timeout

---
 tools/jenkins/run_performance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/jenkins/run_performance.sh b/tools/jenkins/run_performance.sh
index caf0c0bc04c..fbc078330f7 100755
--- a/tools/jenkins/run_performance.sh
+++ b/tools/jenkins/run_performance.sh
@@ -50,7 +50,7 @@ PID2=$!
 #
 # Put a timeout on these tests
 #
-((sleep 900; kill $$)&)
+((sleep 900; kill $$ && killall qps_worker && rm -f /tmp/qps-test.$$ )&)
 
 export QPS_WORKERS="localhost:10000,localhost:10010"