You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2019/07/13 17:58:39 UTC
[bigtop] branch bigtop-alpha updated: fix init scripts
This is an automated email from the ASF dual-hosted git repository.
oflebbe pushed a commit to branch bigtop-alpha
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/bigtop-alpha by this push:
new 0b78f66 fix init scripts
0b78f66 is described below
commit 0b78f665589cb092f3ab52376654b7efac960504
Author: Olaf Flebbe <of...@oflebbe.de>
AuthorDate: Sat Jul 13 19:58:28 2019 +0200
fix init scripts
---
bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc | 2 +-
bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc | 2 +-
bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc | 2 +-
bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc | 2 +-
bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc | 2 +-
bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc | 2 +-
bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc | 2 +-
bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc | 2 +-
bigtop-packages/src/common/hadoop/hadoop-yarn-timelineserver.svc | 2 +-
bigtop-packages/src/templates/init.d.tmpl | 4 ++--
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc
index a0a43a1..2076a93 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc
@@ -15,7 +15,7 @@
HADOOP_NAME="journalnode"
DAEMON="hadoop-hdfs-$HADOOP_NAME"
DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-daemon.sh"
+EXEC_PATH="/usr/bin/hdfs"
SVC_USER="hdfs"
WORKING_DIR="/var/lib/hadoop-hdfs"
DAEMON_FLAGS="$HADOOP_NAME"
diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc
index 9422aac..4ab34cb 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-namenode.svc
@@ -15,7 +15,7 @@
HADOOP_NAME="namenode"
DAEMON="hadoop-hdfs-$HADOOP_NAME"
DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-daemon.sh"
+EXEC_PATH="/usr/bin/hdfs"
SVC_USER="hdfs"
WORKING_DIR="/var/lib/hadoop-hdfs"
DAEMON_FLAGS="$HADOOP_NAME"
diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc
index 625ca3e..4016cbe 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-secondarynamenode.svc
@@ -15,7 +15,7 @@
HADOOP_NAME="secondarynamenode"
DAEMON="hadoop-hdfs-$HADOOP_NAME"
DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-daemon.sh"
+EXEC_PATH="/usr/bin/hdfs"
SVC_USER="hdfs"
WORKING_DIR="/var/lib/hadoop-hdfs"
DAEMON_FLAGS="$HADOOP_NAME"
diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc
index c055def..ff72491 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-zkfc.svc
@@ -15,7 +15,7 @@
HADOOP_NAME="zkfc"
DAEMON="hadoop-hdfs-$HADOOP_NAME"
DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-daemon.sh"
+EXEC_PATH="/usr/bin/hdfs"
SVC_USER="hdfs"
WORKING_DIR="/var/lib/hadoop-hdfs"
DAEMON_FLAGS="$HADOOP_NAME"
diff --git a/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc b/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
index b5b6935..b9ab3a3 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
@@ -15,7 +15,7 @@
HADOOP_NAME="historyserver"
DAEMON="hadoop-mapreduce-$HADOOP_NAME"
DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop-mapreduce/sbin/mr-jobhistory-daemon.sh"
+EXEC_PATH="/usr/bin/mapreduce"
SVC_USER="mapred"
WORKING_DIR="/var/lib/hadoop-mapreduce"
DAEMON_FLAGS="$HADOOP_NAME"
diff --git a/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc b/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc
index 925371a..36f8ca0 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-nodemanager.svc
@@ -15,7 +15,7 @@
HADOOP_NAME="nodemanager"
DAEMON="hadoop-yarn-$HADOOP_NAME"
DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh"
+EXEC_PATH="/usr/bin/yarn"
SVC_USER="yarn"
WORKING_DIR="/var/lib/hadoop-yarn"
DAEMON_FLAGS="$HADOOP_NAME"
diff --git a/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc b/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
index c97a21b..23d5d29 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
@@ -15,7 +15,7 @@
HADOOP_NAME="proxyserver"
DAEMON="hadoop-yarn-$HADOOP_NAME"
DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh"
+EXEC_PATH="/usr/bin/yarn"
SVC_USER="yarn"
WORKING_DIR="/var/lib/hadoop-yarn"
DAEMON_FLAGS="$HADOOP_NAME"
diff --git a/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc b/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc
index 4c402d9..ca77292 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-resourcemanager.svc
@@ -15,7 +15,7 @@
HADOOP_NAME="resourcemanager"
DAEMON="hadoop-yarn-$HADOOP_NAME"
DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh"
+EXEC_PATH="/usr/bin/yarn"
SVC_USER="yarn"
WORKING_DIR="/var/lib/hadoop-yarn"
DAEMON_FLAGS="$HADOOP_NAME"
diff --git a/bigtop-packages/src/common/hadoop/hadoop-yarn-timelineserver.svc b/bigtop-packages/src/common/hadoop/hadoop-yarn-timelineserver.svc
index 11481cc..07aa17b 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-yarn-timelineserver.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-yarn-timelineserver.svc
@@ -15,7 +15,7 @@
HADOOP_NAME="timelineserver"
DAEMON="hadoop-yarn-$HADOOP_NAME"
DESC="Hadoop $HADOOP_NAME"
-EXEC_PATH="/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh"
+EXEC_PATH="/usr/bin/yarn"
SVC_USER="yarn"
WORKING_DIR="/var/lib/hadoop-yarn"
DAEMON_FLAGS="$HADOOP_NAME"
diff --git a/bigtop-packages/src/templates/init.d.tmpl b/bigtop-packages/src/templates/init.d.tmpl
index 42b7758..7dd7449 100755
--- a/bigtop-packages/src/templates/init.d.tmpl
+++ b/bigtop-packages/src/templates/init.d.tmpl
@@ -83,7 +83,7 @@ start() {
[ -x $EXEC_PATH ] || exit $ERROR_PROGRAM_NOT_INSTALLED
[ -d $CONF_DIR ] || exit $ERROR_PROGRAM_NOT_CONFIGURED
- su -s /bin/bash $SVC_USER -c "cd $WORKING_DIR && $EXEC_PATH --config '$CONF_DIR' start $DAEMON_FLAGS"
+ su -s /bin/bash $SVC_USER -c "cd $WORKING_DIR && $EXEC_PATH --config '$CONF_DIR' --daemon start $DAEMON_FLAGS"
# Some processes are slow to start
sleep $SLEEP_TIME
@@ -108,7 +108,7 @@ generate_stop() {
cat <<'__EOT__'
stop() {
- start_daemon $EXEC_PATH --config "$CONF_DIR" stop $DAEMON_FLAGS
+ start_daemon $EXEC_PATH --config "$CONF_DIR" --daemon stop $DAEMON_FLAGS
RETVAL=$?
if [ $RETVAL -eq $RETVAL_SUCCESS ]; then