Repository: phoenix Updated Branches: refs/heads/master 06c10dc39 -> 64b9a6c5d
Revert "PHOENIX-4016 Comment out handler count overrides and reduce number of forked JVMs in tests" This reverts commit 06c10dc391220da8e54f0191bef1c9b8b702f651. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/64b9a6c5 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/64b9a6c5 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/64b9a6c5 Branch: refs/heads/master Commit: 64b9a6c5d5aacb13cd2a0fd65589435f7acd155a Parents: 06c10dc Author: Samarth Jain <sama...@apache.org> Authored: Wed Jul 12 17:43:01 2017 -0700 Committer: Samarth Jain <sama...@apache.org> Committed: Wed Jul 12 17:43:01 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/query/BaseTest.java | 26 ++++++++++---------- pom.xml | 10 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/64b9a6c5/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java index 3d1a7fd..1806a1f 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java @@ -595,19 +595,19 @@ public abstract class BaseTest { * helps us in running several mini clusters at the same time without hitting * the threads limit imposed by the OS. */ -// conf.setInt(HConstants.REGION_SERVER_HANDLER_COUNT, 5); -// conf.setInt("hbase.regionserver.metahandler.count", 2); -// conf.setInt(HConstants.MASTER_HANDLER_COUNT, 2); -// conf.setInt("dfs.namenode.handler.count", 2); -// conf.setInt("dfs.namenode.service.handler.count", 2); -// conf.setInt("dfs.datanode.handler.count", 2); -// conf.setInt("ipc.server.read.threadpool.size", 2); -// conf.setInt("ipc.server.handler.threadpool.size", 2); -// conf.setInt("hbase.regionserver.hlog.syncer.count", 2); -// conf.setInt("hbase.hlog.asyncer.number", 2); -// conf.setInt("hbase.assignment.zkevent.workers", 5); -// conf.setInt("hbase.assignment.threads.max", 5); -// conf.setInt("hbase.catalogjanitor.interval", 5000); + conf.setInt(HConstants.REGION_SERVER_HANDLER_COUNT, 5); + conf.setInt("hbase.regionserver.metahandler.count", 2); + conf.setInt(HConstants.MASTER_HANDLER_COUNT, 2); + conf.setInt("dfs.namenode.handler.count", 2); + conf.setInt("dfs.namenode.service.handler.count", 2); + conf.setInt("dfs.datanode.handler.count", 2); + conf.setInt("ipc.server.read.threadpool.size", 2); + conf.setInt("ipc.server.handler.threadpool.size", 2); + conf.setInt("hbase.regionserver.hlog.syncer.count", 2); + conf.setInt("hbase.hlog.asyncer.number", 2); + conf.setInt("hbase.assignment.zkevent.workers", 5); + conf.setInt("hbase.assignment.threads.max", 5); + conf.setInt("hbase.catalogjanitor.interval", 5000); return conf; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/64b9a6c5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 84e7f3a..a46c50c 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ <!-- Plugin options --> <numForkedUT>8</numForkedUT> - <numForkedIT>4</numForkedIT> + <numForkedIT>8</numForkedIT> <it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests> <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests> @@ -240,7 +240,7 @@ <runOrder>alphabetical</runOrder> <!--parallel>methods</parallel> <threadCount>20</threadCount--> - <argLine>-Xmx4000m -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine> + <argLine>-Xmx2000m -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine> <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile> <shutdown>kill</shutdown> <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory> @@ -275,7 +275,7 @@ at org.apache.phoenix.coprocessor.MetaDataEndpointImpl.doGetTable(MetaDataEndpointImpl.java:2835) at org.apache.phoenix.coprocessor.MetaDataEndpointImpl.getTable(MetaDataEndpointImpl.java:490) --> <!--enableAssertions>false</enableAssertions--> - <argLine>-Xmx5000m -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine> + <argLine>-Xmx3000m -XX:MaxPermSize=256m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled -XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine> <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile> <shutdown>kill</shutdown> <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory> @@ -299,7 +299,7 @@ <forkCount>${numForkedIT}</forkCount> <runOrder>alphabetical</runOrder> <reuseForks>true</reuseForks> - <argLine>-enableassertions -Xmx4000m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine> + <argLine>-enableassertions -Xmx2500m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine> <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile> <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory> <groups>org.apache.phoenix.end2end.ClientManagedTimeTest</groups> @@ -323,7 +323,7 @@ <forkCount>${numForkedIT}</forkCount> <runOrder>alphabetical</runOrder> <reuseForks>true</reuseForks> - <argLine>-enableassertions -Xmx3000m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine> + <argLine>-enableassertions -Xmx2000m -XX:MaxPermSize=128m -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine> <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile> <testSourceDirectory>${basedir}/src/it/java</testSourceDirectory> <groups>org.apache.phoenix.end2end.HBaseManagedTimeTest</groups>
