rahil-c commented on code in PR #19575: URL: https://github.com/apache/hudi/pull/19575#discussion_r3859017120
########## hudi-common/src/test/java/org/apache/hudi/common/TestRegistryExecutorLookup.java: ########## @@ -0,0 +1,167 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hudi.common; + +import org.apache.hudi.common.metrics.ExecutorMetricsContext; +import org.apache.hudi.common.metrics.LocalRegistry; +import org.apache.hudi.common.metrics.Registry; + +import org.junit.jupiter.api.Test; + +import java.util.Collections; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** Characterizes how an executor reaches a driver-published registry by name. */ +public class TestRegistryExecutorLookup { Review Comment: Fixed. Added an `@AfterEach` clearing `Registry.REGISTRY_MAP`, so the entries no longer outlive the class under `reuseForks`. ########## hudi-common/src/main/java/org/apache/hudi/common/config/metrics/HoodieMetricsConfig.java: ########## @@ -109,6 +109,17 @@ public class HoodieMetricsConfig extends HoodieConfig { .sinceVersion("0.13.0") .withDocumentation("Enable metrics for locking infra. Useful when operating in multiwriter mode"); + public static final ConfigProperty<Boolean> RLI_LOOKUP_METRICS_ENABLE = ConfigProperty Review Comment: Added `withRecordIndexLookupMetrics(boolean)` for parity with the siblings. ########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/ExecutorMetricGroup.java: ########## @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hudi.metrics; + +import org.apache.hudi.config.HoodieWriteConfig; + +/** + * One class of executor-collected metric. Implemented by {@link ExecutorMetricRegistry}, which enumerates + * the ones that ship; kept an interface so the collection machinery can be exercised against a group it + * does not know about. + */ +public interface ExecutorMetricGroup { Review Comment: Done. Removed `ExecutorMetricGroup`, `TestExecutorMetricsGenericity`, both test-only `groups` overloads and the unused `RecordIndexMetricNames.registryName` -- 236 lines. You were right that the 3-arg `resolveBundle` had no caller at all. The enum was already the extension point; an interface can come back when a second group lands and its shape is known. ########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/BaseHoodieWriteClient.java: ########## @@ -255,6 +256,12 @@ public boolean commitStats(String instantTime, TableWriteStats tableWriteStats, return true; } extraMetadata = updateExtraMetadata(extraMetadata); + // The commit is the boundary for the record index lookup counters. Snapshot them into this commit's + // metadata now, but only release them from the registry once the commit has actually landed -- + // hooked here rather than in updateExtraMetadata because that is shared with table-service + // scheduling, which would otherwise consume the counters into a compaction or clustering plan. + ExecutorMetrics.DrainedCounters executorCounters = + ExecutorMetrics.snapshotIntoCommitMetadata(extraMetadata.get(), config); Review Comment: Resolved by removing the sink. The counters no longer go into commit metadata at all -- the metrics reporter is the only destination now -- so nothing mutates `extraMetadata` and `runTableServicesInline` has nothing to copy forward. The misattribution is gone structurally rather than by copying the map. ########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metrics/ExecutorMetrics.java: ########## @@ -0,0 +1,135 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hudi.metrics; + +import org.apache.hudi.common.metrics.Registry; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.config.HoodieWriteConfig; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Commit-boundary drain for executor-collected metrics, generic over {@link ExecutorMetricRegistry}. On + * the shared commit path, so it covers Spark DataSource, Spark SQL and DeltaStreamer alike. + */ +public class ExecutorMetrics { + + private ExecutorMetrics() { + } + + /** + * Snapshots into commit metadata without consuming. Split from {@link #publishAndRelease} so a commit + * that never lands neither loses its counters nor publishes gauges for rolled-back work. An all-zero + * registry is skipped to keep residue off the timeline; zeros are otherwise kept, since an explicit + * {@code misses=0} is meaningful. + */ + public static DrainedCounters snapshotIntoCommitMetadata(Map<String, String> commitMetadata, + HoodieWriteConfig config) { + return snapshotIntoCommitMetadata(commitMetadata, config, Arrays.asList(ExecutorMetricRegistry.values())); + } + + /** Visible for testing the collection machinery against a group it does not ship with. */ + static DrainedCounters snapshotIntoCommitMetadata(Map<String, String> commitMetadata, + HoodieWriteConfig config, + Collection<? extends ExecutorMetricGroup> groups) { + List<Drained> drained = new ArrayList<>(); + for (ExecutorMetricGroup metricRegistry : groups) { + if (!metricRegistry.isEnabled(config)) { + continue; + } + Registry registry = Registry.REGISTRY_MAP.get( + Registry.makeKey(config.getTableName(), metricRegistry.scopedName(config.getBasePath()))); + if (registry == null) { + continue; + } + Map<String, Long> counts = new HashMap<>(); + boolean recordedSomething = false; + for (Map.Entry<String, Long> counter : registry.getAllCounts(false).entrySet()) { + if (counter.getValue() == null) { + continue; + } + counts.put(counter.getKey(), counter.getValue()); + recordedSomething |= counter.getValue() != 0L; + } + if (!recordedSomething) { Review Comment: Fixed. A commit that collected nothing now explicitly zeroes the gauge names this group has already published, so a scheduled reporter cannot re-emit the previous commit's numbers. Only names already published are touched, so a table that has never emitted stays absent rather than reporting a row of zeros. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
