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 23:52:21 UTC
[2/2] git commit: BIGTOP-763. Add hdfs-journalnode to hadoop.spec
Updated Branches:
refs/heads/RCs 705a3803a -> 400a3651e
BIGTOP-763. Add hdfs-journalnode to hadoop.spec
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/400a3651
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/400a3651
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/400a3651
Branch: refs/heads/RCs
Commit: 400a3651edcc978f012fe7f9c5154fd81c3862f1
Parents: d81e5f3
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Sun Feb 10 14:51:32 2013 -0800
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Sun Feb 10 14:51:32 2013 -0800
----------------------------------------------------------------------
.../src/common/hadoop/hadoop-hdfs-journalnode.svc | 24 +++++++++++++++
bigtop-packages/src/common/hadoop/hadoop.1 | 5 ++-
bigtop-packages/src/deb/hadoop/control | 9 +++++
bigtop-packages/src/deb/hadoop/rules | 2 +-
bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec | 15 ++++++++-
5 files changed, 52 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/400a3651/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc b/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc
new file mode 100644
index 0000000..2afafb8
--- /dev/null
+++ b/bigtop-packages/src/common/hadoop/hadoop-hdfs-journalnode.svc
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+HADOOP_NAME="journalnode"
+DAEMON="hadoop-hdfs-$HADOOP_NAME"
+DESC="Hadoop $HADOOP_NAME"
+EXEC_PATH="/usr/lib/hadoop/sbin/hadoop-daemon.sh"
+SVC_USER="hdfs"
+DAEMON_FLAGS="$HADOOP_NAME"
+CONF_DIR="/etc/hadoop/conf"
+PIDFILE="/var/run/hadoop-hdfs/hadoop-$SVC_USER-$HADOOP_NAME.pid"
+LOCKDIR="/var/lock/subsys"
+LOCKFILE="hadoop-$HADOOP_NAME"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/400a3651/bigtop-packages/src/common/hadoop/hadoop.1
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/hadoop.1 b/bigtop-packages/src/common/hadoop/hadoop.1
index 1d9de16..6a2f4c8 100644
--- a/bigtop-packages/src/common/hadoop/hadoop.1
+++ b/bigtop-packages/src/common/hadoop/hadoop.1
@@ -274,8 +274,11 @@ Service script for starting and stopping the Hadoop DataNode
.IX Item "/etc/init.d/hadoop-secondarynamenode"
Service script for starting and stopping the Hadoop Secondary NameNode
.IP "/etc/init.d/hadoop\-hdfs\-zkfc" 4
-.IX Item "/etc/init.d/hadoop-secondarynamenode"
+.IX Item "/etc/init.d/hadoop-hdfs-zkfc"
Service script for starting and stopping the Hadoop HDFS failover controller
+.IP "/etc/init.d/hadoop\-hdfs\-journalnode" 4
+.IX Item "/etc/init.d/hadoop-hdfs-journalnode"
+Service script for starting and stopping the Hadoop HDFS JournalNode
.IP "/etc/init.d/hadoop\-yarn\-resourcemanager" 4
.IX Item "/etc/init.d/hadoop-yarn-resourcemanager"
Service script for starting and stopping the Hadoop YARN Resource Manager
http://git-wip-us.apache.org/repos/asf/bigtop/blob/400a3651/bigtop-packages/src/deb/hadoop/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hadoop/control b/bigtop-packages/src/deb/hadoop/control
index 8e019b3..dc7b95c 100644
--- a/bigtop-packages/src/deb/hadoop/control
+++ b/bigtop-packages/src/deb/hadoop/control
@@ -154,6 +154,15 @@ Description: Hadoop HDFS failover controller
for: Health monitoring, ZooKeeper session management, ZooKeeper-based
election.
+Package: hadoop-hdfs-journalnode
+Provides: hadoop-hdfs-journalnode
+Architecture: all
+Depends: hadoop-hdfs (= ${source:Version})
+Description: Hadoop HDFS JournalNode
+ The HDFS JournalNode is responsible for persisting NameNode edit logs.
+ In a typical deployment the JournalNode daemon runs on at least three
+ separate machines in the cluster.
+
Package: hadoop-hdfs-datanode
Architecture: all
Depends: hadoop-hdfs (= ${source:Version})
http://git-wip-us.apache.org/repos/asf/bigtop/blob/400a3651/bigtop-packages/src/deb/hadoop/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/hadoop/rules b/bigtop-packages/src/deb/hadoop/rules
index deb7ae7..a27c205 100755
--- a/bigtop-packages/src/deb/hadoop/rules
+++ b/bigtop-packages/src/deb/hadoop/rules
@@ -39,7 +39,7 @@ override_dh_auto_build:
env HADOOP_VERSION=${hadoop_version} HADOOP_ARCH=${native_dir} \
bash debian/do-component-build -Divy.home=${HOME}/.ivy2
-hadoop_svcs=hdfs-namenode hdfs-secondarynamenode hdfs-datanode hdfs-zkfc \
+hadoop_svcs=hdfs-namenode hdfs-secondarynamenode hdfs-datanode hdfs-zkfc hdfs-journalnode \
yarn-resourcemanager yarn-nodemanager yarn-proxyserver \
mapreduce-historyserver httpfs
http://git-wip-us.apache.org/repos/asf/bigtop/blob/400a3651/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
index cbd2f98..35b85a8 100644
--- a/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
+++ b/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
@@ -56,7 +56,7 @@
%define doc_hadoop %{_docdir}/%{name}-%{hadoop_version}
%define httpfs_services httpfs
%define mapreduce_services mapreduce-historyserver
-%define hdfs_services hdfs-namenode hdfs-secondarynamenode hdfs-datanode hdfs-zkfc
+%define hdfs_services hdfs-namenode hdfs-secondarynamenode hdfs-datanode hdfs-zkfc hdfs-journalnode
%define yarn_services yarn-resourcemanager yarn-nodemanager yarn-proxyserver
%define hadoop_services %{hdfs_services} %{mapreduce_services} %{yarn_services} %{httpfs_services}
# Hadoop outputs built binaries into %{hadoop_build}
@@ -163,6 +163,7 @@ Source20: hdfs.default
Source21: yarn.default
Source22: hadoop-layout.sh
Source23: hadoop-hdfs-zkfc.svc
+Source24: hadoop-hdfs-journalnode.svc
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
BuildRequires: fuse-devel, fuse, cmake
Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, bigtop-utils, zookeeper >= 3.4.0
@@ -290,6 +291,17 @@ which runs a NameNode also runs a ZKFC, and that ZKFC is responsible
for: Health monitoring, ZooKeeper session management, ZooKeeper-based
election.
+%package hdfs-journalnode
+Summary: Hadoop HDFS JournalNode
+Group: System/Daemons
+Requires: %{name}-hdfs = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
+
+%description hdfs-journalnode
+The HDFS JournalNode is responsible for persisting NameNode edit logs.
+In a typical deployment the JournalNode daemon runs on at least three
+separate machines in the cluster.
+
%package hdfs-datanode
Summary: Hadoop Data Node
Group: System/Daemons
@@ -660,6 +672,7 @@ fi
%service_macro hdfs-namenode
%service_macro hdfs-secondarynamenode
%service_macro hdfs-zkfc
+%service_macro hdfs-journalnode
%service_macro hdfs-datanode
%service_macro yarn-resourcemanager
%service_macro yarn-nodemanager