Return-Path: X-Original-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bigtop-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E3CB8C4AF for ; Fri, 27 Apr 2012 21:42:09 +0000 (UTC) Received: (qmail 18516 invoked by uid 500); 27 Apr 2012 21:42:09 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 18460 invoked by uid 500); 27 Apr 2012 21:42:09 -0000 Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@incubator.apache.org Delivered-To: mailing list bigtop-commits@incubator.apache.org Received: (qmail 18448 invoked by uid 99); 27 Apr 2012 21:42:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2012 21:42:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2012 21:42:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D167E238896F; Fri, 27 Apr 2012 21:41:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1331608 - /incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc Date: Fri, 27 Apr 2012 21:41:47 -0000 To: bigtop-commits@incubator.apache.org From: rvs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120427214147.D167E238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rvs Date: Fri Apr 27 21:41:47 2012 New Revision: 1331608 URL: http://svn.apache.org/viewvc?rev=1331608&view=rev Log: BIGTOP-565. catalina-based services should be really careful with catalina stop Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc?rev=1331608&r1=1331607&r2=1331608&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc (original) +++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc Fri Apr 27 21:41:47 2012 @@ -61,7 +61,8 @@ cat <<'__EOT__' stop() { log_success_msg "Stopping ${DESC}: " # FIXME: workaround for BIGTOP-537 - if [ -s $PIDFILE ] ; then + checkstatusofproc + if [ "$?" = "$STATUS_RUNNING" ] ; then su -s /bin/bash $SVC_USER -c "${EXEC_PATH} stop $SLEEP_TIME -force" RETVAL=$? else