From 1869aee3dcf1d5a073c79292fa2442d3f829774c Mon Sep 17 00:00:00 2001
From: Nigel Jones <nigel.l.jones@gmail.com>
Date: Fri, 27 Oct 2017 11:57:13 +0100
Subject: [PATCH] ATLAS-2233: Remove -XX:MaxPermSize Parm as removed in Java 8

Signed-off-by: David Radley <david_radley@uk.ibm.com>
---
 README.txt                                     | 2 +-
 addons/hbase-bridge/pom.xml                    | 1 -
 addons/hdfs-model/pom.xml                      | 1 -
 addons/storm-bridge/pom.xml                    | 1 -
 distro/src/bin/atlas_start.py                  | 2 +-
 distro/src/conf/atlas-env.sh                   | 2 --
 distro/src/test/python/scripts/TestMetadata.py | 8 ++++----
 docs/src/site/twiki/EclipseSetup.twiki         | 2 +-
 docs/src/site/twiki/InstallationSteps.twiki    | 7 +------
 pom.xml                                        | 4 ++--
 repository/pom.xml                             | 1 -
 typesystem/pom.xml                             | 1 -
 webapp/pom.xml                                 | 2 +-
 13 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/README.txt b/README.txt
index 342520f..1bdb573 100755
--- a/README.txt
+++ b/README.txt
@@ -49,7 +49,7 @@ Build Process
 
 2. Execute the following commands to build Apache Atlas
 
-   $ export MAVEN_OPTS="-Xms2g -Xmx2g -XX:MaxPermSize=512M"
+   $ export MAVEN_OPTS="-Xms2g -Xmx2g"
    $ mvn clean install
 
    # currently few tests might fail in some environments
diff --git a/addons/hbase-bridge/pom.xml b/addons/hbase-bridge/pom.xml
index 281e94b..ebdb361 100644
--- a/addons/hbase-bridge/pom.xml
+++ b/addons/hbase-bridge/pom.xml
@@ -219,7 +219,6 @@
                     </args>
                     <jvmArgs>
                         <jvmArg>-Xmx512m</jvmArg>
-                        <jvmArg>-XX:MaxPermSize=128m</jvmArg>
                     </jvmArgs>
                 </configuration>
             </plugin>
diff --git a/addons/hdfs-model/pom.xml b/addons/hdfs-model/pom.xml
index 6ed444a..4fd738a 100644
--- a/addons/hdfs-model/pom.xml
+++ b/addons/hdfs-model/pom.xml
@@ -127,7 +127,6 @@
                     </args>
                     <jvmArgs>
                         <jvmArg>-Xmx512m</jvmArg>
-                        <jvmArg>-XX:MaxPermSize=128m</jvmArg>
                     </jvmArgs>
                     <!--
                     <javacArgs>
diff --git a/addons/storm-bridge/pom.xml b/addons/storm-bridge/pom.xml
index fe1fd5d..16104ca 100644
--- a/addons/storm-bridge/pom.xml
+++ b/addons/storm-bridge/pom.xml
@@ -379,7 +379,6 @@
                     </args>
                     <jvmArgs>
                         <jvmArg>-Xmx512m</jvmArg>
-                        <jvmArg>-XX:MaxPermSize=128m</jvmArg>
                     </jvmArgs>
                     <!--
                     <javacArgs>
diff --git a/distro/src/bin/atlas_start.py b/distro/src/bin/atlas_start.py
index 5ea93fc..39be6b7 100755
--- a/distro/src/bin/atlas_start.py
+++ b/distro/src/bin/atlas_start.py
@@ -24,7 +24,7 @@ import atlas_config as mc
 ATLAS_LOG_OPTS="-Datlas.log.dir=%s -Datlas.log.file=%s.log"
 ATLAS_COMMAND_OPTS="-Datlas.home=%s"
 ATLAS_CONFIG_OPTS="-Datlas.conf=%s"
-DEFAULT_JVM_HEAP_OPTS="-Xmx1024m -XX:MaxPermSize=512m"
+DEFAULT_JVM_HEAP_OPTS="-Xmx1024m"
 DEFAULT_JVM_OPTS="-Dlog4j.configuration=atlas-log4j.xml -Djava.net.preferIPv4Stack=true -server"
 
 def main():
diff --git a/distro/src/conf/atlas-env.sh b/distro/src/conf/atlas-env.sh
index 6a5d5e4..68b24e9 100644
--- a/distro/src/conf/atlas-env.sh
+++ b/distro/src/conf/atlas-env.sh
@@ -37,8 +37,6 @@
 # java heap size we want to set for the atlas server. Default is 1024MB
 #export ATLAS_SERVER_HEAP=
 
-# indicative values for large number of metadata entities (equal or more than 10,000s) for JDK 7
-#export ATLAS_SERVER_HEAP="-Xms15360m -Xmx15360m -XX:MaxNewSize=3072m -XX:PermSize=100M -XX:MaxPermSize=512m"
 # indicative values for large number of metadata entities (equal or more than 10,000s) for JDK 8
 #export ATLAS_SERVER_HEAP="-Xms15360m -Xmx15360m -XX:MaxNewSize=5120m -XX:MetaspaceSize=100M -XX:MaxMetaspaceSize=512m"
 
diff --git a/distro/src/test/python/scripts/TestMetadata.py b/distro/src/test/python/scripts/TestMetadata.py
index 3644943..31e822f 100644
--- a/distro/src/test/python/scripts/TestMetadata.py
+++ b/distro/src/test/python/scripts/TestMetadata.py
@@ -128,7 +128,7 @@ class TestMetadata(unittest.TestCase):
                 ['-app', 'atlas_home\\server\\webapp\\atlas'],
                 'atlas_home\\conf;atlas_home\\server\\webapp\\atlas\\WEB-INF\\classes;atlas_home\\server\\webapp\\atlas\\WEB-INF\\lib\\*;atlas_home\\libext\\*;atlas_home\\hbase\\conf',
                 ['-Datlas.log.dir=atlas_home\\logs', '-Datlas.log.file=application.log', '-Datlas.home=atlas_home',
-                 '-Datlas.conf=atlas_home\\conf', '-Xmx1024m', '-XX:MaxPermSize=512m',
+                 '-Datlas.conf=atlas_home\\conf', '-Xmx1024m',
                  '-Dlog4j.configuration=atlas-log4j.xml', '-Djava.net.preferIPv4Stack=true', '-server'],
                 'atlas_home\\logs')
 
@@ -138,7 +138,7 @@ class TestMetadata(unittest.TestCase):
                 ['-app', 'atlas_home/server/webapp/atlas'],
                 'atlas_home/conf:atlas_home/server/webapp/atlas/WEB-INF/classes:atlas_home/server/webapp/atlas/WEB-INF/lib/*:atlas_home/libext/*:atlas_home/hbase/conf',
                 ['-Datlas.log.dir=atlas_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=atlas_home',
-                 '-Datlas.conf=atlas_home/conf', '-Xmx1024m', '-XX:MaxPermSize=512m',
+                 '-Datlas.conf=atlas_home/conf', '-Xmx1024m',
                  '-Dlog4j.configuration=atlas-log4j.xml', '-Djava.net.preferIPv4Stack=true', '-server'],
                 'atlas_home/logs')
 
@@ -221,7 +221,7 @@ class TestMetadata(unittest.TestCase):
                 ['-app', 'atlas_home\\server\\webapp\\atlas'],
                 'atlas_home\\conf;atlas_home\\server\\webapp\\atlas\\WEB-INF\\classes;atlas_home\\server\\webapp\\atlas\\WEB-INF\\lib\\*;atlas_home\\libext\\*;atlas_home\\hbase\\conf',
                 ['-Datlas.log.dir=atlas_home\\logs', '-Datlas.log.file=application.log', '-Datlas.home=atlas_home',
-                 '-Datlas.conf=atlas_home\\conf', '-Xmx1024m', '-XX:MaxPermSize=512m',
+                 '-Datlas.conf=atlas_home\\conf', '-Xmx1024m',
                  '-Dlog4j.configuration=atlas-log4j.xml', '-Djava.net.preferIPv4Stack=true', '-server'],
                 'atlas_home\\logs')
 
@@ -231,7 +231,7 @@ class TestMetadata(unittest.TestCase):
                 ['-app', 'atlas_home/server/webapp/atlas'],
                 'atlas_home/conf:atlas_home/server/webapp/atlas/WEB-INF/classes:atlas_home/server/webapp/atlas/WEB-INF/lib/*:atlas_home/libext/*:atlas_home/hbase/conf',
                 ['-Datlas.log.dir=atlas_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=atlas_home',
-                 '-Datlas.conf=atlas_home/conf', '-Xmx1024m', '-XX:MaxPermSize=512m',
+                 '-Datlas.conf=atlas_home/conf', '-Xmx1024m',
                  '-Dlog4j.configuration=atlas-log4j.xml', '-Djava.net.preferIPv4Stack=true', '-server'],
                 'atlas_home/logs')
 
diff --git a/docs/src/site/twiki/EclipseSetup.twiki b/docs/src/site/twiki/EclipseSetup.twiki
index 9d21859..b9f1d5b 100644
--- a/docs/src/site/twiki/EclipseSetup.twiki
+++ b/docs/src/site/twiki/EclipseSetup.twiki
@@ -92,7 +92,7 @@ export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Hom
 export M2_HOME=/Applications/apache-maven-3.3.9 # Git is installed in the system path
 export PYTHON_HOME='/Applications/Python 2.7'
 export PATH=$PYTHON_HOME:$M2_HOME/bin:$JAVA_HOME/bin:$PATH
-export MAVEN_OPTS="-Xmx1536m -Drat.numUnapprovedLicenses=100 -XX:MaxPermSize=256m"
+export MAVEN_OPTS="-Xmx1536m -Drat.numUnapprovedLicenses=100"
 </verbatim>
 
    * If you do  not want to set Java 8 as your system java, you can use this  bash script to setup the environment and run Eclipse (which you can drop in Applications and rename to neon).
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 417df11..c59f495 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -7,7 +7,7 @@ git clone https://git-wip-us.apache.org/repos/asf/atlas.git atlas
 
 cd atlas
 
-export MAVEN_OPTS="-Xmx1536m -XX:MaxPermSize=512m" && mvn clean install
+export MAVEN_OPTS="-Xmx1536m" && mvn clean install
 </verbatim>
 
 Once the build successfully completes, artifacts can be packaged for deployment.
@@ -198,11 +198,6 @@ export ATLAS_SERVER_OPTS="-server -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnl
 The =-XX:SoftRefLRUPolicyMSPerMB= option was found to be particularly helpful to regulate GC performance for
 query heavy workloads with many concurrent users.
 
-The following values are recommended for JDK 7:
-<verbatim>
-export ATLAS_SERVER_HEAP="-Xms15360m -Xmx15360m -XX:MaxNewSize=3072m -XX:PermSize=100M -XX:MaxPermSize=512m"
-</verbatim>
-
 The following values are recommended for JDK 8:
 <verbatim>
 export ATLAS_SERVER_HEAP="-Xms15360m -Xmx15360m -XX:MaxNewSize=5120m -XX:MetaspaceSize=100M -XX:MaxMetaspaceSize=512m"
diff --git a/pom.xml b/pom.xml
index 6f67935..5a6add6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1968,7 +1968,7 @@
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <argLine>-Djava.awt.headless=true -Dproject.version=${project.version}
                         -Dhadoop.tmp.dir="${project.build.directory}/tmp-hadoop-${user.name}"
-                        -Xmx1024m -XX:MaxPermSize=512m -Djava.net.preferIPv4Stack=true ${atlas.surefire.options}
+                        -Xmx1024m -Djava.net.preferIPv4Stack=true ${atlas.surefire.options}
                     </argLine>
                     <skip>${skipUTs}</skip>
                 </configuration>
@@ -1994,7 +1994,7 @@
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <argLine>-Djava.awt.headless=true -Dproject.version=${project.version}
                         -Dhadoop.tmp.dir="${project.build.directory}/tmp-hadoop-${user.name}"
-                        -Xmx1024m -XX:MaxPermSize=512m ${atlas.surefire.options}
+                        -Xmx1024m ${atlas.surefire.options}
                     </argLine>
                     <skip>${skipITs}</skip>
                     <reuseForks>false</reuseForks>
diff --git a/repository/pom.xml b/repository/pom.xml
index 94308b4..f981c76 100755
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -205,7 +205,6 @@
                     </args>
                     <jvmArgs>
                         <jvmArg>-Xmx512m</jvmArg>
-                        <jvmArg>-XX:MaxPermSize=128m</jvmArg>
                     </jvmArgs>
                 </configuration>
             </plugin>
diff --git a/typesystem/pom.xml b/typesystem/pom.xml
index 39e18e5..78cacb7 100755
--- a/typesystem/pom.xml
+++ b/typesystem/pom.xml
@@ -143,7 +143,6 @@
                     </args>
                     <jvmArgs>
                         <jvmArg>-Xmx512m</jvmArg>
-                        <jvmArg>-XX:MaxPermSize=128m</jvmArg>
                     </jvmArgs>
                 </configuration>
             </plugin>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index c9cb448..782c280 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -525,7 +525,7 @@
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
                     <argLine>-Djava.awt.headless=true -Dproject.version=${project.version}
                         -Dhadoop.tmp.dir=${project.build.directory}/tmp-hadoop-${user.name}
-                        -Xmx1024m -XX:MaxPermSize=512m
+                        -Xmx1024m
                     </argLine>
                 </configuration>
                 <executions>
--
libgit2 0.27.1