You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sl...@apache.org on 2024/01/17 13:57:45 UTC
(hadoop) branch branch-3.4 updated: HADOOP-19040. mvn site commands fails due to MetricsSystem And MetricsSystemImpl changes. (#6450) Contributed by Shilun Fan.
This is an automated email from the ASF dual-hosted git repository.
slfan1989 pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 67d985620fdd HADOOP-19040. mvn site commands fails due to MetricsSystem And MetricsSystemImpl changes. (#6450) Contributed by Shilun Fan.
67d985620fdd is described below
commit 67d985620fdd3b397634edd5424392358c9e6db0
Author: slfan1989 <55...@users.noreply.github.com>
AuthorDate: Tue Jan 16 22:11:16 2024 +0800
HADOOP-19040. mvn site commands fails due to MetricsSystem And MetricsSystemImpl changes. (#6450) Contributed by Shilun Fan.
Reviewed-by: Steve Loughran <st...@cloudera.com>
Signed-off-by: Shilun Fan <sl...@apache.org>
---
.../hadoop-common/dev-support/jdiff-workaround.patch | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
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 2bd7b63f0178..5b6cd3af825b 100644
--- a/hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff-workaround.patch
@@ -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);
@@ -65,7 +65,6 @@ index a6edf08e5a7..5b87be1ec67 100644
- }
- return sink;
- }
-- allSinks.put(name, sink);
- if (config != null) {
- registerSink(name, description, sink);
- }
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org