You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-issues@hadoop.apache.org by GitBox <gi...@apache.org> on 2022/10/06 10:53:45 UTC
[GitHub] [hadoop] ayushtkn commented on pull request #4953: HADOOP-18401. No ARM binaries in branch-3.3.x releases.
ayushtkn commented on PR #4953:
URL: https://github.com/apache/hadoop/pull/4953#issuecomment-1269804110
Was quite strange on first look, like why a release script is changing the source code, But Jdiff has a bug, because of which during site generation there is a patching logic, the patch now doesn't apply due to conflicts. This problem should come in x86 also.
Just fix the patch something like below & give a check it can be applied without conflicts.
```
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch b/hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch
index 2bd7b63f017..26eb53a990b 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch
@@ -1,5 +1,5 @@
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java
-index a277abd6e13..1d131d5db6e 100644
+index fef8c4b7e4b..8d2b9339706 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/MetricsSystem.java
@@ -42,18 +42,6 @@
@@ -14,7 +14,7 @@ index a277abd6e13..1d131d5db6e 100644
- * the annotations of the source object.)
- * @param desc the description of the source (or null. See above.)
- * @return the source object
-- * @exception MetricsException
+- * @exception MetricsException Metrics Exception.
- */
- public abstract <T> T register(String name, String desc, T source);
-
@@ -38,7 +38,7 @@ index a277abd6e13..1d131d5db6e 100644
+ * the annotations of the source object.)
+ * @param desc the description of the source (or null. See above.)
+ * @return the source object
- * @exception MetricsException
+ * @exception MetricsException Metrics Exception.
*/
- public abstract <T extends MetricsSink>
- T register(String name, String desc, T sink);
```
In case interested, this patching happens here:
https://github.com/steveloughran/hadoop/blob/build/HADOOP-18401-arm-64-branch-3.3/hadoop-project-dist/pom.xml#L222
I have triggered the script, will update the result here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: common-issues-unsubscribe@hadoop.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-issues-help@hadoop.apache.org