Author: rvs
Date: Fri Feb 24 23:15:07 2012
New Revision: 1293471
URL: http://svn.apache.org/viewvc?rev=1293471&view=rev
Log:
BIGTOP-418. Package MAPREDUCE-2858 (MRv2 WebApp Security)
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp?rev=1293471&r1=1293470&r2=1293471&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
Fri Feb 24 23:15:07 2012
@@ -300,6 +300,28 @@ class hadoop {
Kerberos::Host_keytab <| title == "yarn" |> ->
Service["hadoop-yarn-resourcemanager"]
}
+ define proxyserver ($host = $fqdn, $port = "8088", $auth = "simple") {
+ $hadoop_ps_host = $host
+ $hadoop_ps_port = $port
+ $hadoop_security_authentication = $auth
+
+ include common-yarn
+
+ package { "hadoop-yarn-proxyserver":
+ ensure => latest,
+ require => Package["jdk"],
+ }
+
+ service { "hadoop-yarn-proxyserver":
+ ensure => running,
+ hasstatus => true,
+ subscribe => [Package["hadoop-yarn-proxyserver"],
File["/etc/hadoop/conf/hadoop-env.sh"],
+ File["/etc/hadoop/conf/yarn-site.xml"],
File["/etc/hadoop/conf/core-site.xml"]],
+ require => [ Package["hadoop-yarn-proxyserver"] ],
+ }
+ Kerberos::Host_keytab <| title == "yarn" |> ->
Service["hadoop-yarn-proxyserver"]
+ }
+
define historyserver ($host = $fqdn, $port = "10020", $webapp_port =
"19888", $auth = "simple") {
$hadoop_hs_host = $host
$hadoop_hs_port = $port
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml?rev=1293471&r1=1293470&r2=1293471&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
Fri Feb 24 23:15:07 2012
@@ -30,6 +30,15 @@
</property>
<property>
+ <name>yarn.web-proxy.principal</name>
+ <value>yarn/_HOST@<%= kerberos_realm %></value>
+ </property>
+ <property>
+ <name>yarn.web-proxy.keytab</name>
+ <value>/etc/yarn.keytab</value>
+ </property>
+
+ <property>
<name>yarn.nodemanager.principal</name>
<value>yarn/_HOST@<%= kerberos_realm %></value>
</property>
@@ -56,6 +65,11 @@
</property>
<% end %>
+ <!-- FIXME: MAPREDUCE-3916 property>
+ <name>yarn.web-proxy.address</name>
+ <value><%= hadoop_ps_host %>:<%= hadoop_ps_port %></value>
+ </property -->
+
<property>
<name>yarn.resourcemanager.resource-tracker.address</name>
<value><%= hadoop_rm_host %>:<%= hadoop_rt_port %></value>
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc?rev=1293471&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-yarn-proxyserver.svc
Fri Feb 24 23:15:07 2012
@@ -0,0 +1,27 @@
+# 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="proxyserver"
+DAEMON="hadoop-yarn-$HADOOP_NAME"
+DESC="Hadoop $HADOOP_NAME"
+EXEC_PATH="/usr/lib/hadoop/sbin/yarn-daemon.sh"
+SVC_USER="yarn"
+DAEMON_FLAGS="$HADOOP_NAME"
+CONF_DIR="/etc/hadoop/conf"
+PIDFILE="/var/run/yarn/yarn-$SVC_USER-$HADOOP_NAME.pid"
+LOCKFILE="/var/lock/subsys/hadoop-$HADOOP_NAME"
+
+CHKCONFIG="345 85 15"
+INIT_DEFAULT_START="3 4 5"
+INIT_DEFAULT_STOP="0 1 2 6"
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control?rev=1293471&r1=1293470&r2=1293471&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/control
Fri Feb 24 23:15:07 2012
@@ -139,6 +139,13 @@ Depends: hadoop-yarn (= ${source:Version
Description: Resource manager for Hadoop
The resource manager manages the global assignment of compute resources to
applications.
+Package: hadoop-yarn-proxyserver
+Provides: hadoop-yarn-proxyserver
+Architecture: all
+Depends: hadoop-yarn (= ${source:Version})
+Description: Web proxy for YARN
+ The web proxy server sits in front of the YARN application master web UI.
+
Package: hadoop-hdfs-namenode
Provides: hadoop-hdfs-namenode
Architecture: all
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules?rev=1293471&r1=1293470&r2=1293471&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hadoop/rules
Fri Feb 24 23:15:07 2012
@@ -77,13 +77,17 @@ install: build
# Run dh_lintian if we've got it - this doesn't exist on debhelper 6 (eg
Ubuntu Hardy)
(dh_lintian) || /bin/true
-hdfs-namenode hdfs-secondarynamenode hdfs-datanode yarn-resourcemanager
yarn-nodemanager mapreduce-historyserver httpfs: debian/init.d.tmpl
+hadoop_svcs=hdfs-namenode hdfs-secondarynamenode hdfs-datanode \
+ yarn-resourcemanager yarn-nodemanager yarn-proxyserver \
+ mapreduce-historyserver httpfs
+
+$(hadoop_svcs): debian/init.d.tmpl
bash $< debian/[email protected] > debian/[email protected]
# FIXME: workaround for BIGTOP-105
[ -f debian/[email protected] ] || cp
debian/hadoop.daemon.postinst.tpl debian/[email protected]
sed -i -e "s|@HADOOP_DAEMON@|$@|" debian/[email protected]
-install-indep: hdfs-namenode hdfs-secondarynamenode hdfs-datanode
yarn-resourcemanager yarn-nodemanager mapreduce-historyserver httpfs
+install-indep: $(hadoop_svcs)
mkdir -p debian/tmp/etc/default
cp debian/hadoop.default debian/tmp/etc/default/hadoop
cp debian/yarn.default debian/tmp/etc/default/yarn
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1293471&r1=1293470&r2=1293471&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Fri Feb 24 23:15:07 2012
@@ -54,7 +54,7 @@
%define httpfs_services httpfs
%define mapreduce_services mapreduce-historyserver
%define hdfs_services hdfs-namenode hdfs-secondarynamenode hdfs-datanode
-%define yarn_services yarn-resourcemanager yarn-nodemanager
+%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}
%define hadoop_build_path build
@@ -311,6 +311,15 @@ The NodeManager is the per-machine frame
containers, monitoring their resource usage (cpu, memory, disk, network) and
reporting the same to the ResourceManager/Scheduler.
+%package yarn-proxyserver
+Summary: Yarn Web Proxy
+Group: System/Daemons
+Requires: %{name}-yarn = %{version}-%{release}
+Requires(pre): %{name} = %{version}-%{release}
+
+%description yarn-proxyserver
+The web proxy server sits in front of the YARN application master web UI.
+
%package mapreduce-historyserver
Summary: MapReduce History Server
Group: System/Daemons
@@ -616,6 +625,7 @@ fi
%service_macro hdfs-datanode
%service_macro yarn-resourcemanager
%service_macro yarn-nodemanager
+%service_macro yarn-proxyserver
%service_macro mapreduce-historyserver
# Pseudo-distributed Hadoop installation
