From owner-svn-src-user@freebsd.org  Tue May 30 13:31:20 2017
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18EBFB7D10C
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue, 30 May 2017 13:31:20 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D914B19E8;
 Tue, 30 May 2017 13:31:19 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4UDVICe013881;
 Tue, 30 May 2017 13:31:18 GMT (envelope-from pho@FreeBSD.org)
Received: (from pho@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4UDVIdJ013880;
 Tue, 30 May 2017 13:31:18 GMT (envelope-from pho@FreeBSD.org)
Message-Id: <201705301331.v4UDVIdJ013880@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org
 using -f
From: Peter Holm <pho@FreeBSD.org>
Date: Tue, 30 May 2017 13:31:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r319209 - user/pho/stress2/tools
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 May 2017 13:31:20 -0000

Author: pho
Date: Tue May 30 13:31:18 2017
New Revision: 319209
URL: https://svnweb.freebsd.org/changeset/base/319209

Log:
  Improved error handling.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  user/pho/stress2/tools/killall.sh

Modified: user/pho/stress2/tools/killall.sh
==============================================================================
--- user/pho/stress2/tools/killall.sh	Tue May 30 13:30:26 2017	(r319208)
+++ user/pho/stress2/tools/killall.sh	Tue May 30 13:31:18 2017	(r319209)
@@ -30,11 +30,24 @@
 
 # Kill all running test programs from stress2/testcases
 
-for i in `find ../testcases -type f -perm -1`; do
-	list=`echo $list $(basename $i)`
-done
+list="`find ../testcases -type f -perm -1 | xargs basename`"
+[ -z "$list" ] && exit 1
 
-for i in `jot 20`; do
-	killall -q -9 $list 2>/dev/null || break
-	sleep $i
+i=0
+while pkill -9 $list; do
+	[ $((i += 1)) -lt 3 ] && continue
+	if [ -z "$(ps `pgrep $list` | sed 1d)" ]; then # <defunct>
+		for j in "`pgrep $list`"; do
+			ps auxwwl | awk "\$2 == $j"
+		done
+		echo "$0 FAIL"; exit 2
+	fi
+	if [ $i -eq 30 ]; then
+		pgrep $list | xargs ps -lp
+		echo "$0 FAIL @ $i"
+		exit 3
+	fi
+	sleep 5
 done
+[ $i -gt 2 ] && echo "Note: $0 exit @ $i"
+exit 0