You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ev...@apache.org on 2017/05/28 10:45:13 UTC
bigtop git commit: BIGTOP-2778: Delete PermSize / MaxPermsize options,
no longer support by Java 8
Repository: bigtop
Updated Branches:
refs/heads/master 355588b00 -> 5df31b9f5
BIGTOP-2778: Delete PermSize / MaxPermsize options, no longer support by Java 8
Signed-off-by: Evans Ye <ev...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/5df31b9f
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/5df31b9f
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/5df31b9f
Branch: refs/heads/master
Commit: 5df31b9f548ca79b00c1761379cce071d7a69cd5
Parents: 355588b
Author: Arnaud Launay <as...@launay.org>
Authored: Sat May 27 21:30:53 2017 +0200
Committer: Evans Ye <ev...@apache.org>
Committed: Sun May 28 18:44:41 2017 +0800
----------------------------------------------------------------------
bigtop-bigpetstore/bigpetstore-mapreduce/build.gradle | 2 --
.../generator/TestPetStoreTransactionGeneratorJob.java | 4 ++--
bigtop-packages/src/common/ambari/do-component-build | 2 +-
bigtop-packages/src/common/apex/do-component-build | 2 +-
bigtop-packages/src/common/flume/do-component-build | 2 +-
bigtop-packages/src/common/hama/do-component-build | 2 +-
bigtop-packages/src/common/hive/do-component-build | 2 +-
bigtop-packages/src/common/ignite-hadoop/do-component-build | 2 +-
bigtop-packages/src/common/kafka/do-component-build | 2 +-
bigtop-packages/src/common/oozie/do-component-build | 2 +-
bigtop-packages/src/common/spark1/do-component-build | 2 +-
bigtop-packages/src/common/zeppelin/do-component-build | 2 +-
12 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-bigpetstore/bigpetstore-mapreduce/build.gradle
----------------------------------------------------------------------
diff --git a/bigtop-bigpetstore/bigpetstore-mapreduce/build.gradle b/bigtop-bigpetstore/bigpetstore-mapreduce/build.gradle
index 16cc7f8..24c9a01 100644
--- a/bigtop-bigpetstore/bigpetstore-mapreduce/build.gradle
+++ b/bigtop-bigpetstore/bigpetstore-mapreduce/build.gradle
@@ -190,8 +190,6 @@ task integrationTest(type: Test, dependsOn: test) {
//memory requirements.
minHeapSize = "1000m"
maxHeapSize = "4000m"
- // set JVM arguments for the test JVM(s)
- jvmArgs '-XX:MaxPermSize=256m'
break
case "crunch":
patternsToInclude = "*CrunchIT*"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-bigpetstore/bigpetstore-mapreduce/src/test/java/org/apache/bigtop/bigpetstore/generator/TestPetStoreTransactionGeneratorJob.java
----------------------------------------------------------------------
diff --git a/bigtop-bigpetstore/bigpetstore-mapreduce/src/test/java/org/apache/bigtop/bigpetstore/generator/TestPetStoreTransactionGeneratorJob.java b/bigtop-bigpetstore/bigpetstore-mapreduce/src/test/java/org/apache/bigtop/bigpetstore/generator/TestPetStoreTransactionGeneratorJob.java
index 76de3d0..dc23562 100755
--- a/bigtop-bigpetstore/bigpetstore-mapreduce/src/test/java/org/apache/bigtop/bigpetstore/generator/TestPetStoreTransactionGeneratorJob.java
+++ b/bigtop-bigpetstore/bigpetstore-mapreduce/src/test/java/org/apache/bigtop/bigpetstore/generator/TestPetStoreTransactionGeneratorJob.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * run this test with vm options -XX:MaxPermSize=256m -Xms512m -Xmx1024m
+ * run this test with vm options -Xms512m -Xmx1024m
*
*/
public class TestPetStoreTransactionGeneratorJob {
@@ -101,4 +101,4 @@ public class TestPetStoreTransactionGeneratorJob {
+ fs.getFileStatus(new Path(output, "part-r-00000")).getLen()
+ " bytes.");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-packages/src/common/ambari/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/do-component-build b/bigtop-packages/src/common/ambari/do-component-build
index f9a2d0d..59a1634 100644
--- a/bigtop-packages/src/common/ambari/do-component-build
+++ b/bigtop-packages/src/common/ambari/do-component-build
@@ -17,7 +17,7 @@
set -ex
. `dirname $0`/bigtop.bom
-export _JAVA_OPTIONS="-Xmx2048m -XX:MaxPermSize=512m -Djava.awt.headless=true"
+export _JAVA_OPTIONS="-Xmx2048m -Djava.awt.headless=true"
mvn clean package -DskipTests -Drat.skip
(cd contrib/management-packs/odpi-ambari-mpack ; mvn clean package -DskipTests -Drat.skip)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-packages/src/common/apex/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/apex/do-component-build b/bigtop-packages/src/common/apex/do-component-build
index 49a8e82..9d5639b 100644
--- a/bigtop-packages/src/common/apex/do-component-build
+++ b/bigtop-packages/src/common/apex/do-component-build
@@ -16,7 +16,7 @@
. `dirname $0`/bigtop.bom
-export MAVEN_OPTS="-XX:PermSize=1024m -XX:MaxPermSize=1024m"
+export MAVEN_OPTS=""
# bigtop installs maven on its own and not through the package manager
export PATH=/usr/local/maven/bin:$PATH
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-packages/src/common/flume/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/flume/do-component-build b/bigtop-packages/src/common/flume/do-component-build
index bbf7656..b7c3362 100755
--- a/bigtop-packages/src/common/flume/do-component-build
+++ b/bigtop-packages/src/common/flume/do-component-build
@@ -18,7 +18,7 @@ set -ex
. `dirname $0`/bigtop.bom
-export MAVEN_OPTS="-Xmx1536m -Xms256m -XX:MaxPermSize=256m"
+export MAVEN_OPTS="-Xmx1536m -Xms256m"
sed -i -e \
's#<artifactId>asynchbase</artifactId>#<artifactId>asynchbase</artifactId>\n<exclusions>\n<exclusion>\n<groupId>org.apache.zookeeper</groupId>\n<artifactId>zookeeper</artifactId>\n</exclusion>\n</exclusions>#' flume-ng-sinks/flume-ng-hbase-sink/pom.xml
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-packages/src/common/hama/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hama/do-component-build b/bigtop-packages/src/common/hama/do-component-build
index a5bfc91..78bd682 100644
--- a/bigtop-packages/src/common/hama/do-component-build
+++ b/bigtop-packages/src/common/hama/do-component-build
@@ -17,5 +17,5 @@
set -ex
. `dirname $0`/bigtop.bom
-export MAVEN_OPTS="-XX:PermSize=1024m -XX:MaxPermSize=1024m"
+export MAVEN_OPTS=""
mvn -Phadoop2 -Dhadoop.version=$HADOOP_VERSION -Dzookeeper.version=$ZOOKEEPER_VERSION clean install -DskipTests "$@"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-packages/src/common/hive/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hive/do-component-build b/bigtop-packages/src/common/hive/do-component-build
index 2293c55..f8be82c 100644
--- a/bigtop-packages/src/common/hive/do-component-build
+++ b/bigtop-packages/src/common/hive/do-component-build
@@ -31,7 +31,7 @@ HIVE_MAVEN_OPTS=" -Dhbase.version=$HBASE_VERSION \
-Dspark.version=${SPARK1_VERSION}
"
-export MAVEN_OPTS="-Xmx1500m -Xms1500m -XX:MaxPermSize=256m"
+export MAVEN_OPTS="-Xmx1500m -Xms1500m"
mvn ${HIVE_MAVEN_OPTS} clean install -Phadoop-2,dist "$@"
mkdir -p build/dist
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-packages/src/common/ignite-hadoop/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ignite-hadoop/do-component-build b/bigtop-packages/src/common/ignite-hadoop/do-component-build
index 417477c..5f0eb5d 100644
--- a/bigtop-packages/src/common/ignite-hadoop/do-component-build
+++ b/bigtop-packages/src/common/ignite-hadoop/do-component-build
@@ -18,6 +18,6 @@ set -ex
. `dirname $0`/bigtop.bom
-export MAVEN_OPTS="-Xmx512M -XX:MaxPermSize=512M"
+export MAVEN_OPTS="-Xmx512M"
mvn clean install -DskipTests -Dhadoop.version=$HADOOP_VERSION -Dspark.version=$SPARK_VERSION -Dignite.edition=hadoop
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-packages/src/common/kafka/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/kafka/do-component-build b/bigtop-packages/src/common/kafka/do-component-build
index 31cef4a..a67d46b 100644
--- a/bigtop-packages/src/common/kafka/do-component-build
+++ b/bigtop-packages/src/common/kafka/do-component-build
@@ -25,7 +25,7 @@ BUILD_OPTS="-Divy.home=${HOME}/.ivy2 -Dsbt.ivy.home=${HOME}/.ivy2 -Duser.home=${
## this might be an issue at times
# http://maven.40175.n5.nabble.com/Not-finding-artifact-in-local-repo-td3727753.html
-export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=512m -XX:PermSize=1024m -XX:MaxPermSize=1024m"
+export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=512m"
gradle wrapper
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-packages/src/common/oozie/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/do-component-build b/bigtop-packages/src/common/oozie/do-component-build
index 47fefbf..601e5a7 100755
--- a/bigtop-packages/src/common/oozie/do-component-build
+++ b/bigtop-packages/src/common/oozie/do-component-build
@@ -82,7 +82,7 @@ sed -i.bak "/http:\/\/repository.codehaus.org/a\\
<enabled>false</enabled>\\
</releases>" ${WORKDIR}/pom.xml
-export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m"
+export MAVEN_OPTS="-Xmx512m"
# Invoke Oozie build script
${WORKDIR}/bin/mkdistro.sh -DjavaVersion=${JDK_VERSION} -DskipTests -Phadoop-2 -Puber -Dhadoop.version=${HADOOP_VERSION} -Dhadoop.auth.version=${HADOOP_VERSION} -Dhive.version=${HIVE_VERSION} -Dpig.version=${PIG_VERSION} -Dsqoop.version=${SQOOP_VERSION} -Dspark.version=${SPARK_VERSION} ${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
MKDISTRO_RESULT=$?
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-packages/src/common/spark1/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/spark1/do-component-build b/bigtop-packages/src/common/spark1/do-component-build
index c6078b2..7ea85d4 100644
--- a/bigtop-packages/src/common/spark1/do-component-build
+++ b/bigtop-packages/src/common/spark1/do-component-build
@@ -35,7 +35,7 @@ BUILD_OPTS="-Divy.home=${HOME}/.ivy2 -Dsbt.ivy.home=${HOME}/.ivy2 -Duser.home=${
## this might be an issue at times
# http://maven.40175.n5.nabble.com/Not-finding-artifact-in-local-repo-td3727753.html
-export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=512m -XX:PermSize=1024m -XX:MaxPermSize=1024m"
+export MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=512m"
mvn $BUILD_OPTS -DskipTests install
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5df31b9f/bigtop-packages/src/common/zeppelin/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/zeppelin/do-component-build b/bigtop-packages/src/common/zeppelin/do-component-build
index 2939b2a..9906fb4 100644
--- a/bigtop-packages/src/common/zeppelin/do-component-build
+++ b/bigtop-packages/src/common/zeppelin/do-component-build
@@ -59,7 +59,7 @@ else
BUILD_OPTS="$BUILD_OPTS -DskipTests"
fi
-export MAVEN_OPTS="-Xmx1500m -Xms1500m -XX:MaxPermSize=256m"
+export MAVEN_OPTS="-Xmx1500m -Xms1500m"
mvn $BUILD_OPTS clean package