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 A1D279511 for ; Thu, 22 Dec 2011 22:11:52 +0000 (UTC) Received: (qmail 76514 invoked by uid 500); 22 Dec 2011 22:11:52 -0000 Delivered-To: apmail-incubator-bigtop-commits-archive@incubator.apache.org Received: (qmail 76465 invoked by uid 500); 22 Dec 2011 22:11:52 -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 76428 invoked by uid 99); 22 Dec 2011 22:11:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2011 22:11:51 +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; Thu, 22 Dec 2011 22:11:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3412323888FD; Thu, 22 Dec 2011 22:11:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1222486 - in /incubator/bigtop/trunk/bigtop-packages/src: common/hive/hadoop-hive.sh common/sqoop/sqoop-metastore.sh.suse deb/hive/service-init.d.tpl rpm/flume/SOURCES/init.d.suse Date: Thu, 22 Dec 2011 22:11:29 -0000 To: bigtop-commits@incubator.apache.org From: rvs@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111222221130.3412323888FD@eris.apache.org> Author: rvs Date: Thu Dec 22 22:11:29 2011 New Revision: 1222486 URL: http://svn.apache.org/viewvc?rev=1222486&view=rev Log: BIGTOP-315. Cut-n-paste remains of @HADOOP_DAEMON@ in non-hadoop init.d scripts Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse incubator/bigtop/trunk/bigtop-packages/src/deb/hive/service-init.d.tpl incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh?rev=1222486&r1=1222485&r2=1222486&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh (original) +++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/hadoop-hive.sh Thu Dec 22 22:11:29 2011 @@ -109,19 +109,19 @@ hive_status() { case "$status" in $STATUS_RUNNING) - log_success_msg "@HADOOP_DAEMON@ is running" + log_success_msg "@HIVE_DAEMON@ is running" ;; $STATUS_DEAD) - log_failure_msg "@HADOOP_DAEMON@ is dead and pid file exists" + log_failure_msg "@HIVE_DAEMON@ is dead and pid file exists" ;; $STATUS_DEAD_AND_LOCK) - log_failure_msg "@HADOOP_DAEMON@ is dead and lock file exists" + log_failure_msg "@HIVE_DAEMON@ is dead and lock file exists" ;; $STATUS_NOT_RUNNING) - log_failure_msg "@HADOOP_DAEMON@ is not running" + log_failure_msg "@HIVE_DAEMON@ is not running" ;; *) - log_failure_msg "@HADOOP_DAEMON@ status is unknown" + log_failure_msg "@HIVE_DAEMON@ status is unknown" ;; esac return $status Modified: incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse?rev=1222486&r1=1222485&r2=1222486&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse (original) +++ incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/sqoop-metastore.sh.suse Thu Dec 22 22:11:29 2011 @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Starts a Hadoop @HADOOP_DAEMON@ +# Starts a Sqoop metastore # # chkconfig: 2345 90 10 # description: Sqoop allows easy imports and exports of data sets between \ Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/service-init.d.tpl URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/service-init.d.tpl?rev=1222486&r1=1222485&r2=1222486&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/service-init.d.tpl (original) +++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/service-init.d.tpl Thu Dec 22 22:11:29 2011 @@ -117,19 +117,19 @@ hive_status() { case "$status" in $STATUS_RUNNING) - log_success_msg "@HADOOP_DAEMON@ is running" + log_success_msg "@HIVE_DAEMON@ is running" ;; $STATUS_DEAD) - log_failure_msg "@HADOOP_DAEMON@ is dead and pid file exists" + log_failure_msg "@HIVE_DAEMON@ is dead and pid file exists" ;; $STATUS_DEAD_AND_LOCK) - log_failure_msg "@HADOOP_DAEMON@ is dead and lock file exists" + log_failure_msg "@HIVE_DAEMON@ is dead and lock file exists" ;; $STATUS_NOT_RUNNING|$STATUS_DEBIAN_NOT_RUNNING) - log_failure_msg "@HADOOP_DAEMON@ is not running" + log_failure_msg "@HIVE_DAEMON@ is not running" ;; *) - log_failure_msg "@HADOOP_DAEMON@ status is unknown" + log_failure_msg "@HIVE_DAEMON@ status is unknown" ;; esac return $status Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse?rev=1222486&r1=1222485&r2=1222486&view=diff ============================================================================== --- incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse (original) +++ incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SOURCES/init.d.suse Thu Dec 22 22:11:29 2011 @@ -53,7 +53,7 @@ EXEC_PATH=${FLUME_HOME}/bin/flume-daemon DOTIME=3 FLUME_RUN=/var/run/flume FLUME_PID=/var/run/flume/flume-flume-@FLUME_DAEMON@.pid -LOCKFILE="/var/lock/subsys/hadoop-@HADOOP_DAEMON@" +LOCKFILE="/var/lock/subsys/flume-@FLUME_DAEMON@" desc="Flume @FLUME_DAEMON@ daemon" install -d -m 0755 -o flume -g flume ${FLUME_RUN} USER=flume