Return-Path: X-Original-To: apmail-incubator-chukwa-commits-archive@www.apache.org Delivered-To: apmail-incubator-chukwa-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B0DECDF65 for ; Sun, 22 Jul 2012 19:55:43 +0000 (UTC) Received: (qmail 10411 invoked by uid 500); 22 Jul 2012 19:55:43 -0000 Delivered-To: apmail-incubator-chukwa-commits-archive@incubator.apache.org Received: (qmail 10383 invoked by uid 500); 22 Jul 2012 19:55:43 -0000 Mailing-List: contact chukwa-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chukwa-dev@incubator.apache.org Delivered-To: mailing list chukwa-commits@incubator.apache.org Received: (qmail 10364 invoked by uid 99); 22 Jul 2012 19:55:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2012 19:55:43 +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; Sun, 22 Jul 2012 19:55:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DB6D9238899C; Sun, 22 Jul 2012 19:55:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1364418 - in /incubator/chukwa/trunk: CHANGES.txt bin/chukwa Date: Sun, 22 Jul 2012 19:55:22 -0000 To: chukwa-commits@incubator.apache.org From: asrabkin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120722195522.DB6D9238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: asrabkin Date: Sun Jul 22 19:55:22 2012 New Revision: 1364418 URL: http://svn.apache.org/viewvc?rev=1364418&view=rev Log: CHUKWA-649. Handle pid-file missing case while stoping chukwa processes. Contributed by Jie Huang. Modified: incubator/chukwa/trunk/CHANGES.txt incubator/chukwa/trunk/bin/chukwa Modified: incubator/chukwa/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1364418&r1=1364417&r2=1364418&view=diff ============================================================================== --- incubator/chukwa/trunk/CHANGES.txt (original) +++ incubator/chukwa/trunk/CHANGES.txt Sun Jul 22 19:55:22 2012 @@ -6,12 +6,16 @@ Trunk (unreleased changes) IMPROVEMENTS + CHUKWA-649. Handle pid-file missing case while stoping chukwa processes. (Jie Huang via asrabkin) + CHUKWA-645. Updated Hadoop and HBase dependency. (Eric Yang) CHUKWA-630. Added chukwa user setup to rpm package. (Noel Duffy via Eric Yang) CHUKWA-639. Updated to HBase 0.92.1. (Eric Yang) + CHUKWA-647. Spread out intermediate data with the same ReduceType into different Reduce Tasks. (Jie Huang via asrabkin) + BUGS CHUKWA-646. Fix file rotation correctly for 0 byte rotated files. (Ivy Tang via Eric Yang) Modified: incubator/chukwa/trunk/bin/chukwa URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/bin/chukwa?rev=1364418&r1=1364417&r2=1364418&view=diff ============================================================================== --- incubator/chukwa/trunk/bin/chukwa (original) +++ incubator/chukwa/trunk/bin/chukwa Sun Jul 22 19:55:22 2012 @@ -161,7 +161,11 @@ elif [ "$COMMAND" = "tail" ]; then fi if [ "$1" = "stop" ]; then - kill -TERM `cat ${CHUKWA_PID_DIR}/$PID.pid` + if [ -e ${CHUKWA_PID_DIR}/$PID.pid ]; then + kill -TERM `cat ${CHUKWA_PID_DIR}/$PID.pid` + else + echo "Cannot find PID file - $PID.pid; NO $PID to stop"; + fi else # run command if [ "$BACKGROUND" = "false" ]; then