Fixed XX:PermSize to XX:MetaspaceSize for Java 8
Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/f70e7c52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/f70e7c52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/f70e7c52 Branch: refs/heads/HIVEMALL-24-2 Commit: f70e7c52ec1ee88034c71338bf9fc614197d70f8 Parents: 357323a Author: Makoto Yui <[email protected]> Authored: Wed Jul 26 14:48:43 2017 +0900 Committer: Makoto Yui <[email protected]> Committed: Wed Jul 26 14:48:43 2017 +0900 ---------------------------------------------------------------------- pom.xml | 18 ++++++++++++++++++ spark/spark-2.0/pom.xml | 10 ++-------- spark/spark-2.1/pom.xml | 10 ++-------- spark/spark-common/pom.xml | 8 +------- 4 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/f70e7c52/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8b6aa5e..a7dc301 100644 --- a/pom.xml +++ b/pom.xml @@ -288,6 +288,24 @@ <spark.binary.version>2.0</spark.binary.version> </properties> </profile> + <profile> + <id>java7</id> + <properties> + <spark.test.jvm.opts>-ea -Xms1024m -Xmx2048m -XX:PermSize=128m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=128m</spark.test.jvm.opts> + </properties> + <activation> + <jdk>[,1.8)</jdk> <!-- version < 1.8 --> + </activation> + </profile> + <profile> + <id>java8</id> + <properties> + <spark.test.jvm.opts>-ea -Xms1024m -Xmx2048m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:ReservedCodeCacheSize=128m</spark.test.jvm.opts> + </properties> + <activation> + <jdk>[1.8,)</jdk> <!-- version >= 1.8 --> + </activation> + </profile> <profile> <id>compile-xgboost</id> <build> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/f70e7c52/spark/spark-2.0/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.0/pom.xml b/spark/spark-2.0/pom.xml index 123c424..74e9348 100644 --- a/spark/spark-2.0/pom.xml +++ b/spark/spark-2.0/pom.xml @@ -32,9 +32,6 @@ <packaging>jar</packaging> <properties> - <PermGen>64m</PermGen> - <MaxPermGen>512m</MaxPermGen> - <CodeCacheSize>512m</CodeCacheSize> <main.basedir>${project.parent.basedir}</main.basedir> </properties> @@ -164,11 +161,8 @@ <!-- <arg>-feature</arg> --> </args> <jvmArgs> - <jvmArg>-Xms1024m</jvmArg> + <jvmArg>-Xms512m</jvmArg> <jvmArg>-Xmx1024m</jvmArg> - <jvmArg>-XX:PermSize=${PermGen}</jvmArg> - <jvmArg>-XX:MaxPermSize=${MaxPermGen}</jvmArg> - <jvmArg>-XX:ReservedCodeCacheSize=${CodeCacheSize}</jvmArg> </jvmArgs> </configuration> </plugin> @@ -233,7 +227,7 @@ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> <junitxml>.</junitxml> <filereports>SparkTestSuite.txt</filereports> - <argLine>-ea -Xmx2g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine> + <argLine>${spark.test.jvm.opts}</argLine> <stderr /> <environmentVariables> <SPARK_PREPEND_CLASSES>1</SPARK_PREPEND_CLASSES> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/f70e7c52/spark/spark-2.1/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-2.1/pom.xml b/spark/spark-2.1/pom.xml index 22d3e12..d7ab81a 100644 --- a/spark/spark-2.1/pom.xml +++ b/spark/spark-2.1/pom.xml @@ -32,9 +32,6 @@ <packaging>jar</packaging> <properties> - <PermGen>64m</PermGen> - <MaxPermGen>512m</MaxPermGen> - <CodeCacheSize>512m</CodeCacheSize> <main.basedir>${project.parent.basedir}</main.basedir> </properties> @@ -164,11 +161,8 @@ <!-- <arg>-feature</arg> --> </args> <jvmArgs> - <jvmArg>-Xms1024m</jvmArg> + <jvmArg>-Xms512m</jvmArg> <jvmArg>-Xmx1024m</jvmArg> - <jvmArg>-XX:PermSize=${PermGen}</jvmArg> - <jvmArg>-XX:MaxPermSize=${MaxPermGen}</jvmArg> - <jvmArg>-XX:ReservedCodeCacheSize=${CodeCacheSize}</jvmArg> </jvmArgs> </configuration> </plugin> @@ -233,7 +227,7 @@ <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> <junitxml>.</junitxml> <filereports>SparkTestSuite.txt</filereports> - <argLine>-ea -Xmx2g -XX:MaxPermSize=${MaxPermGen} -XX:ReservedCodeCacheSize=${CodeCacheSize}</argLine> + <argLine>${spark.test.jvm.opts}</argLine> <stderr /> <environmentVariables> <SPARK_PREPEND_CLASSES>1</SPARK_PREPEND_CLASSES> http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/f70e7c52/spark/spark-common/pom.xml ---------------------------------------------------------------------- diff --git a/spark/spark-common/pom.xml b/spark/spark-common/pom.xml index e8e8ff4..3153a75 100644 --- a/spark/spark-common/pom.xml +++ b/spark/spark-common/pom.xml @@ -32,9 +32,6 @@ <packaging>jar</packaging> <properties> - <PermGen>64m</PermGen> - <MaxPermGen>1024m</MaxPermGen> - <CodeCacheSize>512m</CodeCacheSize> <main.basedir>${project.parent.basedir}</main.basedir> </properties> @@ -138,11 +135,8 @@ <!-- <arg>-feature</arg> --> </args> <jvmArgs> - <jvmArg>-Xms1024m</jvmArg> + <jvmArg>-Xms512m</jvmArg> <jvmArg>-Xmx1024m</jvmArg> - <jvmArg>-XX:PermSize=${PermGen}</jvmArg> - <jvmArg>-XX:MaxPermSize=${MaxPermGen}</jvmArg> - <jvmArg>-XX:ReservedCodeCacheSize=${CodeCacheSize}</jvmArg> </jvmArgs> </configuration> </plugin>
