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-@[email protected]
-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
