svn commit: r361076 - head/devel/hadoop2

[Dmitry Sivachenko]

Author: demon
Date: Mon Jul  7 12:52:14 2014
New Revision: 361076
URL: http://svnweb.freebsd.org/changeset/ports/361076
QAT: https://qat.redports.org/buildarchive/r361076/

Log:
  With jetty-6.1.26 namenode's threads hung with the following error:
  org.mortbay.io.nio.SelectorManager$SelectSet at abdcc1c JVM BUG(s) - injecting delay 59 times
  
  Downgrade jetty to 6.1.14 to avoid this.

Modified:
  head/devel/hadoop2/Makefile
  head/devel/hadoop2/distinfo
  head/devel/hadoop2/pkg-plist

Modified: head/devel/hadoop2/Makefile
==============================================================================
--- head/devel/hadoop2/Makefile	Mon Jul  7 12:52:11 2014	(r361075)
+++ head/devel/hadoop2/Makefile	Mon Jul  7 12:52:14 2014	(r361076)
@@ -8,11 +8,12 @@ CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE} \
 		LOCAL/demon/:maven \
 		http://people.freebsd.org/~demon/:maven \
-		http://archive.apache.org/dist/tomcat/tomcat-6/v${TOMCAT_VERSION}/bin/:tomcat
+		http://archive.apache.org/dist/tomcat/tomcat-6/v${TOMCAT_VERSION}/bin/:tomcat \
+		http://dist.codehaus.org/jetty/jetty-6.1.14/:jetty
 MASTER_SITE_SUBDIR=${PORTNAME}/common/stable
 PKGNAMEPREFIX=	apache-
 PKGNAMESUFFIX=	2
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat
+DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-hadoop2-${PORTVERSION}-maven-repository.tar.gz:maven apache-tomcat-${TOMCAT_VERSION}.tar.gz:tomcat jetty-6.1.14.zip:jetty
 DIST_SUBDIR=	hadoop
 
 MAINTAINER=	demon at FreeBSD.org
@@ -73,6 +74,13 @@ do-build:
 
 post-build:
 	${RM} ${HADOOP_DIST}/etc/hadoop/*.cmd
+# With jetty-6.1.26 tasktracker's threads hung with the following error:
+# org.mortbay.io.nio.SelectorManager$SelectSet at abdcc1c JVM BUG(s) - injecting delay 59 times
+# See https://issues.apache.org/jira/browse/MAPREDUCE-2386
+.for dir in share/hadoop/common/lib share/hadoop/hdfs/lib share/hadoop/yarn/lib share/hadoop/tools/lib
+	${RM} ${HADOOP_DIST}/${dir}/jetty-util-6.1.26.jar ${HADOOP_DIST}/${dir}/jetty-6.1.26.jar
+	${CP} ${WRKDIR}/jetty-6.1.14/lib/jetty-6.1.14.jar ${WRKDIR}/jetty-6.1.14/lib/jetty-util-6.1.14.jar ${HADOOP_DIST}/${dir}/
+.endfor
 
 do-install:
 	cd ${HADOOP_DIST}/bin && ${INSTALL_SCRIPT} hadoop hdfs mapred rcc yarn ${STAGEDIR}${PREFIX}/bin/

Modified: head/devel/hadoop2/distinfo
==============================================================================
--- head/devel/hadoop2/distinfo	Mon Jul  7 12:52:11 2014	(r361075)
+++ head/devel/hadoop2/distinfo	Mon Jul  7 12:52:14 2014	(r361076)
@@ -4,3 +4,5 @@ SHA256 (hadoop/FreeBSD-hadoop2-2.4.1-mav
 SIZE (hadoop/FreeBSD-hadoop2-2.4.1-maven-repository.tar.gz) = 71669612
 SHA256 (hadoop/apache-tomcat-6.0.36.tar.gz) = bc1be532d48a239a6945b028bf8f253087d3405f6522229226c484bf8ae4d45e
 SIZE (hadoop/apache-tomcat-6.0.36.tar.gz) = 6780936
+SHA256 (hadoop/jetty-6.1.14.zip) = ce8a9cf74c7f3a0099438f33b3adcef07d82347d3d67359da2116660e1571187
+SIZE (hadoop/jetty-6.1.14.zip) = 24903728

Modified: head/devel/hadoop2/pkg-plist
==============================================================================
--- head/devel/hadoop2/pkg-plist	Mon Jul  7 12:52:11 2014	(r361075)
+++ head/devel/hadoop2/pkg-plist	Mon Jul  7 12:52:14 2014	(r361076)
@@ -97,8 +97,8 @@ lib/libhdfs.so.0
 %%DATADIR%%/common/lib/jersey-server-1.9.jar
 %%DATADIR%%/common/lib/jets3t-0.9.0.jar
 %%DATADIR%%/common/lib/jettison-1.1.jar
-%%DATADIR%%/common/lib/jetty-6.1.26.jar
-%%DATADIR%%/common/lib/jetty-util-6.1.26.jar
+%%DATADIR%%/common/lib/jetty-6.1.14.jar
+%%DATADIR%%/common/lib/jetty-util-6.1.14.jar
 %%DATADIR%%/common/lib/jsch-0.1.42.jar
 %%DATADIR%%/common/lib/jsp-api-2.1.jar
 %%DATADIR%%/common/lib/jsr305-1.3.9.jar
@@ -137,8 +137,8 @@ lib/libhdfs.so.0
 %%DATADIR%%/hdfs/lib/jasper-runtime-5.5.23.jar
 %%DATADIR%%/hdfs/lib/jersey-core-1.9.jar
 %%DATADIR%%/hdfs/lib/jersey-server-1.9.jar
-%%DATADIR%%/hdfs/lib/jetty-6.1.26.jar
-%%DATADIR%%/hdfs/lib/jetty-util-6.1.26.jar
+%%DATADIR%%/hdfs/lib/jetty-6.1.14.jar
+%%DATADIR%%/hdfs/lib/jetty-util-6.1.14.jar
 %%DATADIR%%/hdfs/lib/jsp-api-2.1.jar
 %%DATADIR%%/hdfs/lib/jsr305-1.3.9.jar
 %%DATADIR%%/hdfs/lib/log4j-1.2.17.jar
@@ -510,8 +510,8 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/tools/lib/jersey-server-1.9.jar
 %%DATADIR%%/tools/lib/jets3t-0.9.0.jar
 %%DATADIR%%/tools/lib/jettison-1.1.jar
-%%DATADIR%%/tools/lib/jetty-6.1.26.jar
-%%DATADIR%%/tools/lib/jetty-util-6.1.26.jar
+%%DATADIR%%/tools/lib/jetty-6.1.14.jar
+%%DATADIR%%/tools/lib/jetty-util-6.1.14.jar
 %%DATADIR%%/tools/lib/jsch-0.1.42.jar
 %%DATADIR%%/tools/lib/jsp-api-2.1.jar
 %%DATADIR%%/tools/lib/jsr305-1.3.9.jar
@@ -582,8 +582,8 @@ sbin/yarn-daemons.sh
 %%DATADIR%%/yarn/lib/jersey-json-1.9.jar
 %%DATADIR%%/yarn/lib/jersey-server-1.9.jar
 %%DATADIR%%/yarn/lib/jettison-1.1.jar
-%%DATADIR%%/yarn/lib/jetty-6.1.26.jar
-%%DATADIR%%/yarn/lib/jetty-util-6.1.26.jar
+%%DATADIR%%/yarn/lib/jetty-6.1.14.jar
+%%DATADIR%%/yarn/lib/jetty-util-6.1.14.jar
 %%DATADIR%%/yarn/lib/jline-0.9.94.jar
 %%DATADIR%%/yarn/lib/jsr305-1.3.9.jar
 %%DATADIR%%/yarn/lib/leveldbjni-all-1.8.jar