HADOOP-17107. hadoop-azure parallel tests not working on recent JDKs (#2118)

Contributed by Steve Loughran.
This commit is contained in:
Steve Loughran 2020-07-20 10:51:26 +01:00 committed by GitHub
parent 2cec50cf16
commit 9f407bcc88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -303,31 +303,13 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-maven-plugins</artifactId>
<executions> <executions>
<execution> <execution>
<id>create-parallel-tests-dirs</id> <id>parallel-tests-createdir</id>
<phase>test-compile</phase>
<configuration>
<target>
<script language="javascript"><![CDATA[
var baseDirs = [
project.getProperty("test.build.data"),
project.getProperty("test.build.dir"),
project.getProperty("hadoop.tmp.dir")
];
for (var i in baseDirs) {
for (var j = 1; j <= ${testsThreadCount}; ++j) {
var mkdir = project.createTask("mkdir");
mkdir.setDir(new java.io.File(baseDirs[i], j));
mkdir.perform();
}
}
]]></script>
</target>
</configuration>
<goals> <goals>
<goal>run</goal> <goal>parallel-tests-createdir</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
@ -342,7 +324,6 @@
<goal>test</goal> <goal>test</goal>
</goals> </goals>
<configuration> <configuration>
<forkCount>1</forkCount>
<forkCount>${testsThreadCount}</forkCount> <forkCount>${testsThreadCount}</forkCount>
<reuseForks>false</reuseForks> <reuseForks>false</reuseForks>
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine> <argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
@ -408,7 +389,6 @@
<goal>verify</goal> <goal>verify</goal>
</goals> </goals>
<configuration> <configuration>
<forkCount>1</forkCount>
<forkCount>${testsThreadCount}</forkCount> <forkCount>${testsThreadCount}</forkCount>
<reuseForks>false</reuseForks> <reuseForks>false</reuseForks>
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine> <argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>
@ -486,31 +466,13 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-maven-plugins</artifactId>
<executions> <executions>
<execution> <execution>
<id>create-parallel-tests-dirs</id> <id>parallel-tests-createdir</id>
<phase>test-compile</phase>
<configuration>
<target>
<script language="javascript"><![CDATA[
var baseDirs = [
project.getProperty("test.build.data"),
project.getProperty("test.build.dir"),
project.getProperty("hadoop.tmp.dir")
];
for (var i in baseDirs) {
for (var j = 1; j <= ${testsThreadCount}; ++j) {
var mkdir = project.createTask("mkdir");
mkdir.setDir(new java.io.File(baseDirs[i], j));
mkdir.perform();
}
}
]]></script>
</target>
</configuration>
<goals> <goals>
<goal>run</goal> <goal>parallel-tests-createdir</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
@ -652,31 +614,13 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-maven-plugins</artifactId>
<executions> <executions>
<execution> <execution>
<id>create-parallel-tests-dirs</id> <id>parallel-tests-createdir</id>
<phase>test-compile</phase>
<configuration>
<target>
<script language="javascript"><![CDATA[
var baseDirs = [
project.getProperty("test.build.data"),
project.getProperty("test.build.dir"),
project.getProperty("hadoop.tmp.dir")
];
for (var i in baseDirs) {
for (var j = 1; j <= ${testsThreadCount}; ++j) {
var mkdir = project.createTask("mkdir");
mkdir.setDir(new java.io.File(baseDirs[i], j));
mkdir.perform();
}
}
]]></script>
</target>
</configuration>
<goals> <goals>
<goal>run</goal> <goal>parallel-tests-createdir</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
@ -691,7 +635,6 @@
<goal>test</goal> <goal>test</goal>
</goals> </goals>
<configuration> <configuration>
<forkCount>1</forkCount>
<forkCount>${testsThreadCount}</forkCount> <forkCount>${testsThreadCount}</forkCount>
<reuseForks>false</reuseForks> <reuseForks>false</reuseForks>
<argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine> <argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine>