svn commit: r360147 - head/devel/hadoop

[Dmitry Sivachenko]

Author: demon
Date: Wed Jul  2 07:26:12 2014
New Revision: 360147
URL: http://svnweb.freebsd.org/changeset/ports/360147
QAT: https://qat.redports.org/buildarchive/r360147/

Log:
  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
  
  Downgrade jetty to 6.1.14 to avoid this.

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

Modified: head/devel/hadoop/Makefile
==============================================================================
--- head/devel/hadoop/Makefile	Wed Jul  2 06:57:38 2014	(r360146)
+++ head/devel/hadoop/Makefile	Wed Jul  2 07:26:12 2014	(r360147)
@@ -5,10 +5,12 @@ PORTNAME=	hadoop
 PORTVERSION=	1.2.1
 PORTREVISION=	1
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITES=	${MASTER_SITE_APACHE} \
+		http://dist.codehaus.org/jetty/jetty-6.1.14/:jetty
 MASTER_SITE_SUBDIR=	${PORTNAME}/core/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	apache-
 DIST_SUBDIR=	hadoop
+DISTFILES+=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} jetty-6.1.14.zip:jetty
 
 MAINTAINER=	demon at FreeBSD.org
 COMMENT=	Apache Map/Reduce framework
@@ -93,6 +95,11 @@ post-patch:
 .for d in ${FIX_DOCS}
 	@${TOUCH} ${WRKSRC}/${d}/.empty
 .endfor
+# 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
+	${RM} ${WRKSRC}/lib/jetty-6.1.26.jar ${WRKSRC}/lib/jetty-util-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 ${WRKSRC}/lib/
 
 post-build:
 	@cd ${WRKSRC} ;${ANT} FreeBSD-dist

Modified: head/devel/hadoop/distinfo
==============================================================================
--- head/devel/hadoop/distinfo	Wed Jul  2 06:57:38 2014	(r360146)
+++ head/devel/hadoop/distinfo	Wed Jul  2 07:26:12 2014	(r360147)
@@ -1,2 +1,4 @@
 SHA256 (hadoop/hadoop-1.2.1.tar.gz) = 94a1181771f173bdb55c8f901722825866396091f0516bdd12b34dc3de1706a1
 SIZE (hadoop/hadoop-1.2.1.tar.gz) = 63851630
+SHA256 (hadoop/jetty-6.1.14.zip) = ce8a9cf74c7f3a0099438f33b3adcef07d82347d3d67359da2116660e1571187
+SIZE (hadoop/jetty-6.1.14.zip) = 24903728

Modified: head/devel/hadoop/pkg-plist
==============================================================================
--- head/devel/hadoop/pkg-plist	Wed Jul  2 06:57:38 2014	(r360146)
+++ head/devel/hadoop/pkg-plist	Wed Jul  2 07:26:12 2014	(r360147)
@@ -193,8 +193,8 @@ bin/hadoop
 %%DATADIR%%/lib/jersey-json-1.8.jar
 %%DATADIR%%/lib/jersey-server-1.8.jar
 %%DATADIR%%/lib/jets3t-0.6.1.jar
-%%DATADIR%%/lib/jetty-6.1.26.jar
-%%DATADIR%%/lib/jetty-util-6.1.26.jar
+%%DATADIR%%/lib/jetty-6.1.14.jar
+%%DATADIR%%/lib/jetty-util-6.1.14.jar
 %%DATADIR%%/lib/jsch-0.1.42.jar
 %%DATADIR%%/lib/junit-4.5.jar
 %%DATADIR%%/lib/kfs-0.2.2.jar