asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mb...@apache.org
Subject incubator-asterixdb git commit: Fix Intermittent Hangs In Recovery Tests
Date Fri, 20 May 2016 04:46:44 GMT
Repository: incubator-asterixdb
Updated Branches:
  refs/heads/master 3cb1016ff -> 51f01bfe1


Fix Intermittent Hangs In Recovery Tests

Update recovery script to exact match on target PID

Change-Id: I48d1f1a8c882e6f45d09c37df1c129463f2eaaf4
Reviewed-on: https://asterix-gerrit.ics.uci.edu/869
Reviewed-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <bamousaa@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/51f01bfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/51f01bfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/51f01bfe

Branch: refs/heads/master
Commit: 51f01bfe1167deb05e422618b9579bc70d4f7eb1
Parents: 3cb1016
Author: Michael Blow <mblow@apache.org>
Authored: Thu May 19 18:15:49 2016 -0700
Committer: Michael Blow <michael.blow@couchbase.com>
Committed: Thu May 19 21:46:24 2016 -0700

----------------------------------------------------------------------
 .../src/main/resources/events/node_failure/nc_failure.sh         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/51f01bfe/asterixdb/asterix-events/src/main/resources/events/node_failure/nc_failure.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-events/src/main/resources/events/node_failure/nc_failure.sh
b/asterixdb/asterix-events/src/main/resources/events/node_failure/nc_failure.sh
index 1dc0938..39a51db 100644
--- a/asterixdb/asterix-events/src/main/resources/events/node_failure/nc_failure.sh
+++ b/asterixdb/asterix-events/src/main/resources/events/node_failure/nc_failure.sh
@@ -25,10 +25,10 @@ PID_INFO=`ps -ef |  grep asterix | grep -v grep | grep -v nc_join |  grep
$PAREN
 PID=`echo $PID_INFO | cut -d " " -f2`
 kill -15 $PID
 
-cmd_output=$(jps|grep $PID)
+cmd_output=$(jps|grep "^$PID\s")
 while [ ${#cmd_output} -ne 0 ]
 do
   sleep 1
   kill -15 $PID
-  cmd_output=$(jps|grep $PID)
+  cmd_output=$(jps|grep "^$PID\s")
 done


Mime
View raw message