You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by je...@apache.org on 2016/09/24 23:14:08 UTC

hbase git commit: HBASE-16667 Building with JDK 8: ignoring option MaxPermSize=256m (Niels Basjes)

Repository: hbase
Updated Branches:
  refs/heads/master 7ed93f8f7 -> 2765b9d9d


HBASE-16667 Building with JDK 8: ignoring option MaxPermSize=256m (Niels Basjes)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2765b9d9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2765b9d9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2765b9d9

Branch: refs/heads/master
Commit: 2765b9d9d965c61b3c40f81752cadb8ad536b501
Parents: 7ed93f8
Author: Jerry He <je...@apache.org>
Authored: Sat Sep 24 16:07:25 2016 -0700
Committer: Jerry He <je...@apache.org>
Committed: Sat Sep 24 16:07:25 2016 -0700

----------------------------------------------------------------------
 conf/hbase-env.cmd        | 4 ----
 conf/hbase-env.sh         | 5 +----
 dev-support/jenkinsEnv.sh | 2 +-
 hbase-it/pom.xml          | 5 +----
 hbase-spark/pom.xml       | 2 +-
 pom.xml                   | 6 +++---
 6 files changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2765b9d9/conf/hbase-env.cmd
----------------------------------------------------------------------
diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd
index eb31b1b..d16de55 100644
--- a/conf/hbase-env.cmd
+++ b/conf/hbase-env.cmd
@@ -42,10 +42,6 @@
 @rem @rem See TestIPv6NIOServerSocketChannel.
 set HBASE_OPTS="-XX:+UseConcMarkSweepGC" "-Djava.net.preferIPv4Stack=true"
 
-@rem Configure PermSize. Only needed in JDK7. You can safely remove it for JDK8+
-set HBASE_MASTER_OPTS=%HBASE_MASTER_OPTS% "-XX:PermSize=128m" "-XX:MaxPermSize=128m"
-set HBASE_REGIONSERVER_OPTS=%HBASE_REGIONSERVER_OPTS% "-XX:PermSize=128m" "-XX:MaxPermSize=128m"
-
 @rem Uncomment below to enable java garbage collection logging for the server-side processes
 @rem this enables basic gc logging for the server processes to the .out file
 @rem set SERVER_GC_OPTS="-verbose:gc" "-XX:+PrintGCDetails" "-XX:+PrintGCDateStamps" %HBASE_GC_OPTS%

http://git-wip-us.apache.org/repos/asf/hbase/blob/2765b9d9/conf/hbase-env.sh
----------------------------------------------------------------------
diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh
index c45e7a5..31e8441 100644
--- a/conf/hbase-env.sh
+++ b/conf/hbase-env.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #
 #/**
 # * Licensed to the Apache Software Foundation (ASF) under one
@@ -42,10 +43,6 @@
 # see http://hbase.apache.org/book.html#performance
 export HBASE_OPTS="-XX:+UseConcMarkSweepGC"
 
-# Configure PermSize. Only needed in JDK7. You can safely remove it for JDK8+
-export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -XX:PermSize=128m -XX:MaxPermSize=128m"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -XX:PermSize=128m -XX:MaxPermSize=128m"
-
 # Uncomment one of the below three options to enable java garbage collection logging for the server-side processes.
 
 # This enables basic gc logging to the .out file.

http://git-wip-us.apache.org/repos/asf/hbase/blob/2765b9d9/dev-support/jenkinsEnv.sh
----------------------------------------------------------------------
diff --git a/dev-support/jenkinsEnv.sh b/dev-support/jenkinsEnv.sh
index 6961437..d7fe873 100755
--- a/dev-support/jenkinsEnv.sh
+++ b/dev-support/jenkinsEnv.sh
@@ -30,7 +30,7 @@ export CLOVER_HOME=/home/jenkins/tools/clover/latest
 export MAVEN_HOME=/home/jenkins/tools/maven/latest
 
 export PATH=$PATH:$JAVA_HOME/bin:$ANT_HOME/bin:
-export MAVEN_OPTS="${MAVEN_OPTS:-"-Xmx3100M -XX:-UsePerfData -XX:MaxPermSize=256m"}"
+export MAVEN_OPTS="${MAVEN_OPTS:-"-Xmx3100M -XX:-UsePerfData"}"
 
 ulimit -n
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/2765b9d9/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index f27b47a..07b5683 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -91,9 +91,6 @@
             <excludes>
               <exclude>${unittest.include}</exclude>
               <exclude>**/*$*</exclude>
-              <!--Do this to prevent OOME because permgen is full seen on build.apache.org
-               -->
-              <!--<exclude>${test.exclude.pattern}</exclude>-->
             </excludes>
             <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
             <environmentVariables>
@@ -174,7 +171,7 @@
             <!-- TODO: failsafe does timeout, but verify does not fail the build because of the timeout.
                  I believe it is a failsafe bug, we may consider using surefire -->
             <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
-            <argLine>-enableassertions -Xmx${failsafe.Xmx} -XX:MaxPermSize=368m
+            <argLine>-enableassertions -Xmx${failsafe.Xmx}
                 -Djava.security.egd=file:/dev/./urandom -XX:+CMSClassUnloadingEnabled
                 -verbose:gc -XX:+PrintCommandLineFlags  -XX:+PrintFlagsFinal</argLine>
           </configuration>

http://git-wip-us.apache.org/repos/asf/hbase/blob/2765b9d9/hbase-spark/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-spark/pom.xml b/hbase-spark/pom.xml
index aa03854..7cd78f0 100644
--- a/hbase-spark/pom.xml
+++ b/hbase-spark/pom.xml
@@ -631,7 +631,7 @@
                         <configuration>
                             <tagsToExclude>Integration-Test</tagsToExclude>
                             <argLine>
-                                -Xmx1536m -XX:MaxPermSize=512m -XX:ReservedCodeCacheSize=512m
+                                -Xmx1536m -XX:ReservedCodeCacheSize=512m
                             </argLine>
                             <parallel>false</parallel>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/hbase/blob/2765b9d9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c148b19..ae7a80a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1262,10 +1262,10 @@
     <!--Mark our test runs with '-Dhbase.build.id' so we can identify a surefire test as ours in a process listing
      -->
     <hbase-surefire.argLine>-enableassertions -Dhbase.build.id=${build.id} -Xmx${surefire.Xmx}
-      -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
+      -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
       -Djava.awt.headless=true
     </hbase-surefire.argLine>
-    <hbase-surefire.cygwin-argLine>-enableassertions -Xmx${surefire.cygwinXmx} -XX:MaxPermSize=256m
+    <hbase-surefire.cygwin-argLine>-enableassertions -Xmx${surefire.cygwinXmx}
       -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
       "-Djava.library.path=${hadoop.library.path};${java.library.path}"
     </hbase-surefire.cygwin-argLine>
@@ -2754,7 +2754,7 @@
          or you can provide the license with -Dmaven.clover.licenseLocation=/path/to/license. Committers can find
          the license under https://svn.apache.org/repos/private/committers/donated-licenses/clover/
          The report will be generated under target/site/clover/index.html when you run
-         MAVEN_OPTS="-Xmx2048m -XX:MaxPermSize=512m" mvn clean package -Pclover site -->
+         MAVEN_OPTS="-Xmx2048m" mvn clean package -Pclover site -->
     <profile>
       <id>clover</id>
       <activation>