-
Notifications
You must be signed in to change notification settings - Fork 439
TEZ-4695: Consolidate surefire plugin config to remove redundant surefire blocks #467
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -105,14 +105,8 @@ | |
| <snappy-java.version>1.1.10.4</snappy-java.version> | ||
| <spotless-maven-plugin.version>3.1.0</spotless-maven-plugin.version> | ||
| <test.build.data>${project.build.directory}/tmp</test.build.data> | ||
| <test.log.dir>${project.build.directory}/logs</test.log.dir> | ||
| <wro4j-maven-plugin.version>1.7.9</wro4j-maven-plugin.version> | ||
| <test.jvm.args> | ||
| --add-opens=java.base/java.lang=ALL-UNNAMED | ||
| --add-opens=java.base/java.util=ALL-UNNAMED | ||
| --add-opens java.base/java.io=ALL-UNNAMED | ||
| -Dnet.bytebuddy.experimental=true | ||
| </test.jvm.args> | ||
|
|
||
| <maven.javadoc.skip>true</maven.javadoc.skip> <!-- enabled only in relevant modules separately --> | ||
| </properties> | ||
| <scm> | ||
|
|
@@ -959,11 +953,18 @@ | |
| <reuseForks>false</reuseForks> | ||
| <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds> | ||
| <testFailureIgnore>true</testFailureIgnore> | ||
| <argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</argLine> | ||
| <argLine>${test.jvm.args}</argLine> | ||
| <argLine> | ||
| -XX:+HeapDumpOnOutOfMemoryError | ||
| --add-opens=java.base/java.lang=ALL-UNNAMED | ||
| --add-opens=java.base/java.util=ALL-UNNAMED | ||
| --add-opens=java.base/java.io=ALL-UNNAMED | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In 3rd |
||
| -Dnet.bytebuddy.experimental=true | ||
| </argLine> | ||
| <environmentVariables> | ||
| <JAVA_HOME>${java.home}</JAVA_HOME> | ||
| <LOG_DIRS>${test.log.dir}</LOG_DIRS> | ||
| <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX> | ||
| <TEZ_AM_EXTERNAL_ID>test-external-id</TEZ_AM_EXTERNAL_ID> | ||
| </environmentVariables> | ||
| <systemPropertyVariables> | ||
| <test.build.data>${test.build.data}</test.build.data> | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,10 +24,6 @@ | |
| </parent> | ||
| <artifactId>tez-tests</artifactId> | ||
|
|
||
| <properties> | ||
| <test.log.dir>${project.build.directory}/logs</test.log.dir> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. removed <test.log.dir> property from child pom's . The ant plugin in child pom is still using it but the appropriate value is propagated from parent pom to child pom. |
||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.tez</groupId> | ||
|
|
@@ -156,16 +152,6 @@ | |
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <configuration> | ||
| <argLine>${test.jvm.args}</argLine> | ||
| <environmentVariables> | ||
| <LOG_DIRS>${test.log.dir}</LOG_DIRS> | ||
| </environmentVariables> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Having 2 argline is a BUG. The test.jvm.args is overwriting the above argLine i.e. Xmx one

Screenshots:
Before:
After:

There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Aggarwal-Raghav : patch itself looks good to me, only a minor concern: now as -Xmx1024m finally applied post-patch, I'm not sure how that behave pre-patch in terms of max heap? the only reason I'm worried about this is that unit tests look to be slower in this run, e.g. tez-dag took 6min, while in other PRs it was 3-4mins consistently
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the default Xmx value was behaving well so far (locally and CI) then we could keep it the same for now. We could revisit the size if/when we encounter memory issues.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
agreed, if pre-patch there was no Xmx applied, we can simply remove it now, no further investigation needed