You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2014/04/25 01:05:11 UTC
[02/50] git commit: HAD-611. Nonstop daemon script should have an
option to start GeoNode for WAN version
HAD-611. Nonstop daemon script should have an option to start GeoNode for WAN version
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/84e12ec5
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/84e12ec5
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/84e12ec5
Branch: refs/heads/master
Commit: 84e12ec5d87c152dd3d1859e7487f8c2bbd1cb4b
Parents: 8d8adc9
Author: Konstantin Boudnik <co...@apache.org>
Authored: Mon Oct 21 13:15:35 2013 -0700
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Mon Oct 21 13:15:35 2013 -0700
----------------------------------------------------------------------
.../src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.default | 3 +++
.../src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.svc | 2 +-
bigtop-packages/src/common/wdd-namenode-nonstop/nonstop | 4 ++++
.../src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec | 2 +-
4 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/84e12ec5/bigtop-packages/src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.default
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.default b/bigtop-packages/src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.default
index c6ee4a8..12468ba 100644
--- a/bigtop-packages/src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.default
+++ b/bigtop-packages/src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.default
@@ -27,3 +27,6 @@ export HADOOP_NAMENODE_USER=hdfs
export HADOOP_SECONDARYNAMENODE_USER=hdfs
export HADOOP_DATANODE_USER=hdfs
export HADOOP_IDENT_STRING=hdfs
+
+## The following should be set to "wan" to run GeoNode for WAN edition
+export NONSTOP_NODE_TYPE=nonstop
http://git-wip-us.apache.org/repos/asf/bigtop/blob/84e12ec5/bigtop-packages/src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.svc b/bigtop-packages/src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.svc
index c6e65b4..99d33fd 100644
--- a/bigtop-packages/src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.svc
+++ b/bigtop-packages/src/common/wdd-namenode-nonstop/hadoop-hdfs-nonstop.svc
@@ -17,7 +17,7 @@ DAEMON="hadoop-hdfs-$HADOOP_NAME"
DESC="Hadoop $HADOOP_NAME namenode"
EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-nonstop-daemon.sh"
SVC_USER="hdfs"
-DAEMON_FLAGS="$HADOOP_NAME"
+DAEMON_FLAGS="\$NONSTOP_NODE_TYPE"
CONF_DIR="/etc/hadoop/conf.nonstop"
PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid"
LOCKDIR="/var/lock/subsys"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/84e12ec5/bigtop-packages/src/common/wdd-namenode-nonstop/nonstop
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/wdd-namenode-nonstop/nonstop b/bigtop-packages/src/common/wdd-namenode-nonstop/nonstop
index 0cfb118..53e53d2 100755
--- a/bigtop-packages/src/common/wdd-namenode-nonstop/nonstop
+++ b/bigtop-packages/src/common/wdd-namenode-nonstop/nonstop
@@ -31,6 +31,7 @@ function print_usage(){
echo " secondarynamenode run the DFS secondary namenode"
echo " namenode run the DFS namenode"
echo " nonstop run the NonStop namenode"
+ echo " wan run the WAN NonStop namenode"
echo " journalnode run the DFS journalnode"
echo " zkfc run the ZK Failover Controller daemon"
echo " datanode run a DFS datanode"
@@ -82,6 +83,9 @@ if [ "$COMMAND" = "namenode" ] ; then
elif [ "$COMMAND" = "nonstop" ] ; then
CLASS='org.apache.hadoop.hdfs.server.namenode.ConsensusNode'
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_ZKFC_OPTS"
+elif [ "$COMMAND" = "wan" ] ; then
+ CLASS='org.apache.hadoop.hdfs.consensus.wan.GeoNode'
+ HADOOP_OPTS="$HADOOP_OPTS $HADOOP_ZKFC_OPTS"
elif [ "$COMMAND" = "zkfc" ] ; then
CLASS='org.apache.hadoop.hdfs.tools.DFSZKFailoverController'
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_ZKFC_OPTS"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/84e12ec5/bigtop-packages/src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec b/bigtop-packages/src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec
index 739434e..a75ce99 100644
--- a/bigtop-packages/src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec
+++ b/bigtop-packages/src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec
@@ -93,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
%post
## FIXME: This is awful hack. But I don't see a better way around it at the moment
-sed -e 's#namenode|secondarynamenode|datanode|journalnode|dfs|dfsadmin|fsck|balancer|zkfc)#nonstop)#' -e 's#hdfsScript="$HADOOP_PREFIX"/bin/hdfs#hdfsScript="$HADOOP_PREFIX"/bin/nonstop#' -e 's#hdfsScript="$HADOOP_HDFS_HOME"/bin/hdfs#hdfsScript="$HADOOP_HDFS_HOME"/bin/nonstop#' %{lib_hadoop}/sbin/hadoop-daemon.sh > %{lib_hadoop}/sbin/hadoop-nonstop-daemon.sh
+sed -e 's#namenode|secondarynamenode|datanode|journalnode|dfs|dfsadmin|fsck|balancer|zkfc)#nonstop|wan)#' -e 's#hdfsScript="$HADOOP_PREFIX"/bin/hdfs#hdfsScript="$HADOOP_PREFIX"/bin/nonstop#' -e 's#hdfsScript="$HADOOP_HDFS_HOME"/bin/hdfs#hdfsScript="$HADOOP_HDFS_HOME"/bin/nonstop#' %{lib_hadoop}/sbin/hadoop-daemon.sh > %{lib_hadoop}/sbin/hadoop-nonstop-daemon.sh
%__chmod 755 %{lib_hadoop}/sbin/hadoop-nonstop-daemon.sh
for service in %{hadoop_services}