HDDS-232. Parallel unit test execution for HDDS/Ozone. Contributed by Arpit Agarwal.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d1850720 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d1850720 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d1850720 Branch: refs/heads/HDFS-12943 Commit: d18507209e268aa5be0d3e56cec23de24107e7d9 Parents: 1fe5b93 Author: Nanda kumar <na...@apache.org> Authored: Fri Jul 13 19:50:52 2018 +0530 Committer: Nanda kumar <na...@apache.org> Committed: Fri Jul 13 19:50:52 2018 +0530 ---------------------------------------------------------------------- .../common/report/TestReportPublisher.java | 2 +- hadoop-hdds/pom.xml | 49 ++++++++++++++++++++ hadoop-ozone/pom.xml | 49 ++++++++++++++++++++ 3 files changed, 99 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d1850720/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java index 026e7aa..d4db55b 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/report/TestReportPublisher.java @@ -111,7 +111,7 @@ public class TestReportPublisher { publisher.init(dummyContext, executorService); Thread.sleep(150); Assert.assertEquals(1, ((DummyReportPublisher) publisher).getReportCount); - Thread.sleep(150); + Thread.sleep(100); Assert.assertEquals(2, ((DummyReportPublisher) publisher).getReportCount); executorService.shutdown(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/d1850720/hadoop-hdds/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index 573803b..09fac33 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -116,4 +116,53 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> </plugin> </plugins> </build> + + <profiles> + <profile> + <id>parallel-tests</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-maven-plugins</artifactId> + <executions> + <execution> + <id>parallel-tests-createdir</id> + <goals> + <goal>parallel-tests-createdir</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>${testsThreadCount}</forkCount> + <reuseForks>false</reuseForks> + <argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine> + <systemPropertyVariables> + <testsThreadCount>${testsThreadCount}</testsThreadCount> + <test.build.data>${test.build.data}/${surefire.forkNumber}</test.build.data> + <test.build.dir>${test.build.dir}/${surefire.forkNumber}</test.build.dir> + <hadoop.tmp.dir>${hadoop.tmp.dir}/${surefire.forkNumber}</hadoop.tmp.dir> + + <!-- This is intentionally the same directory for all JUnit --> + <!-- forks, for use in the very rare situation that --> + <!-- concurrent tests need to coordinate, such as using lock --> + <!-- files. --> + <test.build.shared.data>${test.build.data}</test.build.shared.data> + + <!-- Due to a Maven quirk, setting this to just --> + <!-- surefire.forkNumber won't do the parameter substitution. --> + <!-- Putting a prefix in front of it like "fork-" makes it --> + <!-- work. --> + <test.unique.fork.id>fork-${surefire.forkNumber}</test.unique.fork.id> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/hadoop/blob/d1850720/hadoop-ozone/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index b655088..e82a3d8 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -178,4 +178,53 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> </plugin> </plugins> </build> + + <profiles> + <profile> + <id>parallel-tests</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-maven-plugins</artifactId> + <executions> + <execution> + <id>parallel-tests-createdir</id> + <goals> + <goal>parallel-tests-createdir</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>${testsThreadCount}</forkCount> + <reuseForks>false</reuseForks> + <argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine> + <systemPropertyVariables> + <testsThreadCount>${testsThreadCount}</testsThreadCount> + <test.build.data>${test.build.data}/${surefire.forkNumber}</test.build.data> + <test.build.dir>${test.build.dir}/${surefire.forkNumber}</test.build.dir> + <hadoop.tmp.dir>${hadoop.tmp.dir}/${surefire.forkNumber}</hadoop.tmp.dir> + + <!-- This is intentionally the same directory for all JUnit --> + <!-- forks, for use in the very rare situation that --> + <!-- concurrent tests need to coordinate, such as using lock --> + <!-- files. --> + <test.build.shared.data>${test.build.data}</test.build.shared.data> + + <!-- Due to a Maven quirk, setting this to just --> + <!-- surefire.forkNumber won't do the parameter substitution. --> + <!-- Putting a prefix in front of it like "fork-" makes it --> + <!-- work. --> + <test.unique.fork.id>fork-${surefire.forkNumber}</test.unique.fork.id> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
