Repository: hbase
Updated Branches:
  refs/heads/0.98 433672a67 -> a1342abbb
  refs/heads/branch-1 66ccc2211 -> 1d90fed56
  refs/heads/branch-1.0 8407957c2 -> 71edf3ffe
  refs/heads/master f97c00fd9 -> 200ec5b19


HBASE-12747 IntegrationTestMTTR will OOME if launched with mvn verify (Abhishek 
Singh Chouhan)


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

Branch: refs/heads/branch-1.0
Commit: 71edf3ffef6a5c2f6abbbbb5edc02a79b11b2f43
Parents: 8407957
Author: Andrew Purtell <apurt...@apache.org>
Authored: Mon Feb 9 18:54:38 2015 -0800
Committer: Andrew Purtell <apurt...@apache.org>
Committed: Mon Feb 9 18:54:38 2015 -0800

----------------------------------------------------------------------
 hbase-it/pom.xml | 4 +++-
 pom.xml          | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/71edf3ff/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index af811b0..391e147 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -35,6 +35,8 @@
     <!-- Test inclusion patterns used by failsafe configuration -->
     <unittest.include>**/Test*.java</unittest.include>
     <integrationtest.include>**/IntegrationTest*.java</integrationtest.include>
+    <!-- To Run Tests with a particular Xmx Value use -Dfailsafe.Xmx=XXXg -->
+    <failsafe.Xmx>3g</failsafe.Xmx>
     <!-- To run a single integration test, use -Dit.test=IntegrationTestXXX -->
   </properties>
 
@@ -127,7 +129,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 -Xmx1900m
+            <argLine>-enableassertions -Xmx${failsafe.Xmx}
               -Djava.security.egd=file:/dev/./urandom</argLine>
             <testFailureIgnore>false</testFailureIgnore>
           </configuration>

http://git-wip-us.apache.org/repos/asf/hbase/blob/71edf3ff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 809fc55..74e559d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1073,11 +1073,14 @@
     <test.output.tofile>true</test.output.tofile>
     <surefire.timeout>900</surefire.timeout>
     <test.exclude.pattern></test.exclude.pattern>
-    <hbase-surefire.argLine>-enableassertions -XX:MaxDirectMemorySize=1G 
-Xmx1900m
+    <!-- default Xmx value is 1900m. Use -Dsurefire.Xmx=xxg to run tests with 
different JVM Xmx value -->
+    <surefire.Xmx>1900m</surefire.Xmx>
+    <surefire.cygwinXmx>1900m</surefire.cygwinXmx>
+    <hbase-surefire.argLine>-enableassertions -XX:MaxDirectMemorySize=1G 
-Xmx${surefire.Xmx}
       -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom 
-Djava.net.preferIPv4Stack=true
       -Djava.awt.headless=true
     </hbase-surefire.argLine>
-    <hbase-surefire.cygwin-argline>-enableassertions -Xmx1900m 
-XX:MaxPermSize=256m
+    <hbase-surefire.cygwin-argline>-enableassertions -Xmx${surefire.cygwinXmx} 
-XX:MaxPermSize=256m
       -Djava.security.egd=file:/dev/./urandom -Djava.net.preferIPv4Stack=true
       "-Djava.library.path=${hadoop.library.path};${java.library.path}"
     </hbase-surefire.cygwin-argline>

Reply via email to