You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/02/10 07:04:02 UTC
[3/50] [abbrv] git commit: BIGTOP-713. use newer debhelper and source
format 3.0 (quilt) for Debian and Ubuntu packaging
BIGTOP-713. use newer debhelper and source format 3.0 (quilt) for Debian and Ubuntu packaging
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f9de13be
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f9de13be
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f9de13be
Branch: refs/heads/RCs
Commit: f9de13be3a5889c0bc8dad3d3d3ce72ead9e66c4
Parents: 06ee92f
Author: Anatoli Fomenko <af...@yahoo.com>
Authored: Wed Nov 21 13:22:29 2012 -0800
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Wed Nov 21 13:22:29 2012 -0800
----------------------------------------------------------------------
.../hadoop/hadoop-mapreduce-historyserver.svc | 47 ++++++++++++++-
.../src/common/hadoop/mapreduce.default | 8 +--
2 files changed, 49 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f9de13be/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc b/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
index 2b071f0..2192b12 100644
--- a/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
+++ b/bigtop-packages/src/common/hadoop/hadoop-mapreduce-historyserver.svc
@@ -19,6 +19,51 @@ EXEC_PATH="/usr/lib/hadoop-mapreduce/sbin/mr-jobhistory-daemon.sh"
SVC_USER="mapred"
DAEMON_FLAGS="$HADOOP_NAME"
CONF_DIR="/etc/hadoop/conf"
-PIDFILE="/var/run/hadoop-mapreduce/yarn-$SVC_USER-$HADOOP_NAME.pid"
+PIDFILE="/var/run/hadoop-mapreduce/mapred-$SVC_USER-$HADOOP_NAME.pid"
LOCKDIR="/var/lock/subsys"
LOCKFILE="hadoop-$HADOOP_NAME"
+
+# FIXME: MAPREDUCE-4814
+# redefined generate_start() and generate_stop() (removed "--config '$CONF_DIR'")
+
+generate_start() {
+
+cat <<'__EOT__'
+
+start() {
+ [ -x $EXEC_PATH ] || exit $ERROR_PROGRAM_NOT_INSTALLED
+ [ -d $CONF_DIR ] || exit $ERROR_PROGRAM_NOT_CONFIGURED
+ log_success_msg "Starting ${DESC}: "
+
+ su -s /bin/bash $SVC_USER -c "$EXEC_PATH start $DAEMON_FLAGS"
+
+ # Some processes are slow to start
+ sleep $SLEEP_TIME
+ checkstatusofproc
+ RETVAL=$?
+
+ [ $RETVAL -eq $RETVAL_SUCCESS ] && touch $LOCKFILE
+ return $RETVAL
+}
+
+__EOT__
+
+}
+
+
+generate_stop() {
+
+cat <<'__EOT__'
+
+stop() {
+ log_success_msg "Stopping ${DESC}: "
+ start_daemon $EXEC_PATH stop $DAEMON_FLAGS
+ RETVAL=$?
+
+ [ $RETVAL -eq $RETVAL_SUCCESS ] && rm -f $LOCKFILE $PIDFILE
+}
+
+__EOT__
+
+}
+
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f9de13be/bigtop-packages/src/common/hadoop/mapreduce.default
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/mapreduce.default b/bigtop-packages/src/common/hadoop/mapreduce.default
index a1be37f..cfd35cc 100644
--- a/bigtop-packages/src/common/hadoop/mapreduce.default
+++ b/bigtop-packages/src/common/hadoop/mapreduce.default
@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# FIXME: MAPREDUCE-3900
-export YARN_IDENT_STRING=mapred
-export YARN_PID_DIR=/var/run/hadoop-mapreduce
-export YARN_LOG_DIR=/var/log/hadoop-mapreduce
-export HADOOP_LOG_DIR=/var/log/hadoop-mapreduce
+export HADOOP_MAPRED_IDENT_STRING=mapred
+export HADOOP_MAPRED_PID_DIR=/var/run/hadoop-mapreduce
+export HADOOP_MAPRED_LOG_DIR=/var/log/hadoop-mapreduce