Skip to content
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

HDDS-11600. Intermittent failure in repro due to ordering differences in builddef.lst #7342

Merged
merged 1 commit into from
Oct 23, 2024

Conversation

adoroszlai
Copy link
Contributor

What changes were proposed in this pull request?

Fix intermittent failure in repro check:

--- /home/runner/.m2/repository/org/apache/ozone/ozone-manager/2.0.0-SNAPSHOT/ozone-manager-2.0.0-SNAPSHOT.jar
+++ hadoop-ozone/ozone-manager/target/ozone-manager-2.0.0-SNAPSHOT.jar
...
├── builddef.lst
│┄ ordering differences only

caused by:

aspectj-maven-plugin generates a builddef.lst file with the detailed options passed to AspectJ and this file is embedded in the final jar. (source)

The contents of builddef.lst is non-reproducible due to:

  • order of arguments may be different between runs (depends on filesystem iteration)
  • arguments contain absolute paths

Since this file is not required at runtime, we should exclude it from the jar, which is made possible by dev-aspectj/aspectj-maven-plugin@b4c9a8c

https://issues.apache.org/jira/browse/HDDS-11600

How was this patch tested?

Verified that builddef.lst is no longer part of the jar:

$ unzip -t hadoop-ozone/dist/target/ozone-2.0.0-SNAPSHOT/share/ozone/lib/ozone-manager-2.0.0-SNAPSHOT.jar | grep -c builddef.lst
0

$ find . -name builddef.lst
./hadoop-ozone/ozone-manager/target/aspectj-build/builddef.lst

Regular CI:
https://github.com/adoroszlai/ozone/actions/runs/11455208945

@adoroszlai adoroszlai added the CI label Oct 22, 2024
@adoroszlai adoroszlai self-assigned this Oct 22, 2024
@adoroszlai adoroszlai changed the title HDDS-11600. ordering differences in ozone-manager builddef.lst HDDS-11600. Intermittent failure in repro due to ordering differences in builddef.lst Oct 23, 2024
Copy link
Contributor

@sadanand48 sadanand48 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@adoroszlai adoroszlai merged commit 35b6a3a into apache:master Oct 23, 2024
40 checks passed
@adoroszlai adoroszlai deleted the HDDS-11600 branch October 23, 2024 19:43
@adoroszlai
Copy link
Contributor Author

Thanks @sadanand48 for the review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants