This is an automated email from the ASF dual-hosted git repository. pwason pushed a commit to branch release-0.14.0 in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 9be80c7bc0377c9f88a8a4fb957a69561d236ea6 Author: Sivabalan Narayanan <[email protected]> AuthorDate: Wed Aug 30 17:39:54 2023 -0400 [HUDI-6445] Fixing metrics to use IN-MEMORY type in tests (#9543) --- .../test/java/org/apache/hudi/testutils/TestHoodieMetadataBase.java | 6 ++---- .../apache/hudi/metadata/SparkHoodieBackedTableMetadataWriter.java | 3 ++- .../org/apache/hudi/client/functional/TestHoodieMetadataBase.java | 6 ++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/TestHoodieMetadataBase.java b/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/TestHoodieMetadataBase.java index e7f13991add..18f872bd86d 100644 --- a/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/TestHoodieMetadataBase.java +++ b/hudi-client/hudi-java-client/src/test/java/org/apache/hudi/testutils/TestHoodieMetadataBase.java @@ -35,12 +35,12 @@ import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.config.metrics.HoodieMetricsConfig; -import org.apache.hudi.config.metrics.HoodieMetricsGraphiteConfig; import org.apache.hudi.index.HoodieIndex; import org.apache.hudi.metadata.HoodieMetadataWriteUtils; import org.apache.hudi.metadata.HoodieTableMetadata; import org.apache.hudi.metadata.HoodieTableMetadataWriter; import org.apache.hudi.metadata.JavaHoodieBackedTableMetadataWriter; +import org.apache.hudi.metrics.MetricsReporterType; import org.apache.hudi.table.HoodieJavaTable; import org.apache.hudi.table.HoodieTable; @@ -303,9 +303,7 @@ public class TestHoodieMetadataBase extends HoodieJavaClientTestHarness { .ignoreSpuriousDeletes(validateMetadataPayloadConsistency) .build()) .withMetricsConfig(HoodieMetricsConfig.newBuilder().on(enableMetrics) - .withExecutorMetrics(enableMetrics).build()) - .withMetricsGraphiteConfig(HoodieMetricsGraphiteConfig.newBuilder() - .usePrefix("unit-test").build()) + .withExecutorMetrics(enableMetrics).withReporterType(MetricsReporterType.INMEMORY.name()).build()) .withRollbackUsingMarkers(useRollbackUsingMarkers) .withProperties(properties); } diff --git a/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/metadata/SparkHoodieBackedTableMetadataWriter.java b/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/metadata/SparkHoodieBackedTableMetadataWriter.java index f01547e01a9..15b527a0fe3 100644 --- a/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/metadata/SparkHoodieBackedTableMetadataWriter.java +++ b/hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/metadata/SparkHoodieBackedTableMetadataWriter.java @@ -33,6 +33,7 @@ import org.apache.hudi.common.util.Option; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.data.HoodieJavaRDD; import org.apache.hudi.metrics.DistributedRegistry; +import org.apache.hudi.metrics.MetricsReporterType; import org.apache.hadoop.conf.Configuration; import org.apache.spark.api.java.JavaRDD; @@ -98,7 +99,7 @@ public class SparkHoodieBackedTableMetadataWriter extends HoodieBackedTableMetad protected void initRegistry() { if (metadataWriteConfig.isMetricsOn()) { Registry registry; - if (metadataWriteConfig.isExecutorMetricsEnabled()) { + if (metadataWriteConfig.isExecutorMetricsEnabled() && metadataWriteConfig.getMetricsReporterType() != MetricsReporterType.INMEMORY) { registry = Registry.getRegistry("HoodieMetadata", DistributedRegistry.class.getName()); HoodieSparkEngineContext sparkEngineContext = (HoodieSparkEngineContext) engineContext; ((DistributedRegistry) registry).register(sparkEngineContext.getJavaSparkContext()); diff --git a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieMetadataBase.java b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieMetadataBase.java index e0a00c24e92..f8e3750f6a5 100644 --- a/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieMetadataBase.java +++ b/hudi-client/hudi-spark-client/src/test/java/org/apache/hudi/client/functional/TestHoodieMetadataBase.java @@ -35,12 +35,12 @@ import org.apache.hudi.config.HoodieCompactionConfig; import org.apache.hudi.config.HoodieIndexConfig; import org.apache.hudi.config.HoodieWriteConfig; import org.apache.hudi.config.metrics.HoodieMetricsConfig; -import org.apache.hudi.config.metrics.HoodieMetricsGraphiteConfig; import org.apache.hudi.index.HoodieIndex; import org.apache.hudi.metadata.HoodieMetadataWriteUtils; import org.apache.hudi.metadata.HoodieTableMetadata; import org.apache.hudi.metadata.HoodieTableMetadataWriter; import org.apache.hudi.metadata.SparkHoodieBackedTableMetadataWriter; +import org.apache.hudi.metrics.MetricsReporterType; import org.apache.hudi.table.HoodieSparkTable; import org.apache.hudi.table.HoodieTable; import org.apache.hudi.testutils.HoodieSparkClientTestHarness; @@ -344,9 +344,7 @@ public class TestHoodieMetadataBase extends HoodieSparkClientTestHarness { .ignoreSpuriousDeletes(validateMetadataPayloadConsistency) .build()) .withMetricsConfig(HoodieMetricsConfig.newBuilder().on(enableMetrics) - .withExecutorMetrics(enableMetrics).build()) - .withMetricsGraphiteConfig(HoodieMetricsGraphiteConfig.newBuilder() - .usePrefix("unit-test").build()) + .withExecutorMetrics(enableMetrics).withReporterType(MetricsReporterType.INMEMORY.name()).build()) .withRollbackUsingMarkers(useRollbackUsingMarkers) .withProperties(properties); }
