Skip to content

Conversation

@slfan1989
Copy link
Contributor

@slfan1989 slfan1989 commented Jan 15, 2024

Description of PR

JIRA: HADOOP-19040. mvn site commands fails due to MetricsSystem And MetricsSystemImpl changes.

When executing the mvn site command, an error will appear in the hadoop-common module.

The error message is as follows:

[INFO] Executed tasks
[INFO]
[INFO] --- maven-antrun-plugin:1.7:run (post-site) @ hadoop-common ---
[INFO] Executing tasks

main:
     [exec] patching file src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java
     [exec] Hunk #1 succeeded at 42 with fuzz 2.
     [exec] Hunk #2 FAILED at 79.
     [exec] 1 out of 2 hunks FAILED -- saving rejects to file src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java.rej
     [exec] patching file src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
     [exec] Hunk #1 succeeded at 293 with fuzz 1 (offset 24 lines).
     [exec] patching file src/test/java/org/apache/hadoop/metrics2/impl/TestGangliaMetrics.java
     [exec] Result: 1

To solve the jdiff bug(HADOOP-13428), we introduced jdiff-workaround.patch during the compilation process, but there were some changes in the MetricsSystem.java and MetricsSystemImpl.java codes, and we need to update workaround.patch.

How was this patch tested?

For code changes:

  • Does the title or this PR starts with the corresponding JIRA issue id (e.g. 'HADOOP-17799. Your PR title ...')?
  • Object storage: have the integration tests been executed and the endpoint declared according to the connector-specific documentation?
  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE, LICENSE-binary, NOTICE-binary files?

@hadoop-yetus
Copy link

🎊 +1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 6m 40s Docker mode activated.
_ Prechecks _
+1 💚 dupname 0m 0s No case conflicting files found.
+0 🆗 codespell 0m 0s codespell was not available.
+0 🆗 detsecrets 0m 0s detect-secrets was not available.
+1 💚 @author 0m 0s The patch does not contain any @author tags.
_ trunk Compile Tests _
+1 💚 shadedclient 29m 39s branch has no errors when building and testing our client artifacts.
_ Patch Compile Tests _
+1 💚 blanks 0m 0s The patch has no blanks issues.
+1 💚 shadedclient 18m 36s patch has no errors when building and testing our client artifacts.
_ Other Tests _
+1 💚 asflicense 0m 25s The patch does not generate ASF License warnings.
57m 53s
Subsystem Report/Notes
Docker ClientAPI=1.43 ServerAPI=1.43 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6450/1/artifact/out/Dockerfile
GITHUB PR #6450
Optional Tests dupname asflicense codespell detsecrets
uname Linux f301c53c406e 5.15.0-88-generic #98-Ubuntu SMP Mon Oct 2 15:18:56 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality dev-support/bin/hadoop.sh
git revision trunk / f73778a
Max. process+thread count 556 (vs. ulimit of 5500)
modules C: hadoop-common-project/hadoop-common U: hadoop-common-project/hadoop-common
Console output https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-6450/1/console
versions git=2.25.1 maven=3.6.3
Powered by Apache Yetus 0.14.0 https://yetus.apache.org

This message was automatically generated.

Copy link
Contributor

@steveloughran steveloughran left a comment

Choose a reason for hiding this comment

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

LGTM
+1

@slfan1989
Copy link
Contributor Author

@steveloughran Thank you for reviewing the code!

@slfan1989 slfan1989 merged commit 6652922 into apache:trunk Jan 16, 2024
slfan1989 added a commit that referenced this pull request Jan 17, 2024
…sSystemImpl changes. (#6450) Contributed by Shilun Fan.

Reviewed-by: Steve Loughran <[email protected]>
Signed-off-by: Shilun Fan <[email protected]>
slfan1989 added a commit that referenced this pull request Jan 17, 2024
…sSystemImpl changes. (#6450) Contributed by Shilun Fan.

Reviewed-by: Steve Loughran <[email protected]>
Signed-off-by: Shilun Fan <[email protected]>
jiajunmao pushed a commit to jiajunmao/hadoop-MLEC that referenced this pull request Feb 6, 2024
…sSystemImpl changes. (apache#6450) Contributed by Shilun Fan.

Reviewed-by: Steve Loughran <[email protected]>
Signed-off-by: Shilun Fan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants