From da175f7ecc7730eeb6d83379a37b1d3c750b0cfd Mon Sep 17 00:00:00 2001
From: Aaron Gao <gzh@fb.com>
Date: Thu, 30 Mar 2017 13:56:52 -0700
Subject: [PATCH] exit with code 2 when there is already a db_bench running in
 regression test

Summary: Closes https://github.com/facebook/rocksdb/pull/2063

Differential Revision: D4805507

Pulled By: lightmark

fbshipit-source-id: 59ccb18
---
 tools/regression_test.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/tools/regression_test.sh b/tools/regression_test.sh
index e75ad978a..b9af153cd 100755
--- a/tools/regression_test.sh
+++ b/tools/regression_test.sh
@@ -235,21 +235,13 @@ function run_db_bench {
       --num_multi_db=$NUM_MULTI_DB \
       --max_background_compactions=$MAX_BACKGROUND_COMPACTIONS \
       --seed=$SEED 2>&1"
-  kill_db_bench_cmd="pkill db_bench"
   ps_cmd="ps aux"
   if ! [ -z "$REMOTE_USER_AT_HOST" ]; then
     echo "Running benchmark remotely on $REMOTE_USER_AT_HOST"
-    kill_db_bench_cmd="$SSH $REMOTE_USER_AT_HOST $kill_db_bench_cmd"
     db_bench_cmd="$SSH $REMOTE_USER_AT_HOST $db_bench_cmd"
     ps_cmd="$SSH $REMOTE_USER_AT_HOST $ps_cmd"
   fi
 
-  ## kill existing db_bench processes
-  eval "$kill_db_bench_cmd"
-  if [ $? -eq 0 ]; then
-    echo "Killed all currently running db_bench"
-  fi
-
   ## make sure no db_bench is running
   # The following statement is necessary make sure "eval $ps_cmd" will success.
   # Otherwise, if we simply check whether "$(eval $ps_cmd | grep db_bench)" is
@@ -263,7 +255,7 @@ function run_db_bench {
   if [ "$grep_output" != "" ]; then
     echo "Stopped regression_test.sh as there're still db_bench processes running:"
     echo $grep_output
-    exit 1
+    exit 2
   fi
 
   ## run the db_bench