This is an automated email from the ASF dual-hosted git repository. Caideyipi pushed a commit to branch codex/fix-pipe-config-region-remaining-events in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4c4c9eed08624ad0f071ec52961bd3a18845f33b Author: Caideyipi <[email protected]> AuthorDate: Mon Nov 2 10:47:41 2026 +0800 [Pipe] Fix ConfigRegion remaining event count lookup --- .../pipe/metric/source/PipeConfigRegionSourceMetrics.java | 4 +++- .../pipe/metric/PipeConfigNodeMetricsRestartTest.java | 13 +++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigRegionSourceMetrics.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigRegionSourceMetrics.java index 44dcdf2c522..d96b00fd2e0 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigRegionSourceMetrics.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/metric/source/PipeConfigRegionSourceMetrics.java @@ -36,6 +36,8 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; +import static org.apache.iotdb.commons.client.AbstractConfigNodeInfo.CONFIG_REGION_ID; + public class PipeConfigRegionSourceMetrics implements IMetricSet { private static final Logger LOGGER = LoggerFactory.getLogger(PipeConfigRegionSourceMetrics.class); @@ -117,7 +119,7 @@ public class PipeConfigRegionSourceMetrics implements IMetricSet { //////////////////////////// Show pipes //////////////////////////// public long getRemainingEventCount(final String pipeName, final long creationTime) { - final String taskID = pipeName + "_" + creationTime; + final String taskID = pipeName + "_" + CONFIG_REGION_ID.getId() + "_" + creationTime; final IoTDBConfigRegionSource extractor = extractorMap.get(taskID); // Do not print log to allow collection when config region extractor does not exists if (Objects.isNull(extractor)) { diff --git a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeMetricsRestartTest.java b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeMetricsRestartTest.java index 0bd5e52aff1..51a42cbbd2a 100644 --- a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeMetricsRestartTest.java +++ b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/pipe/metric/PipeConfigNodeMetricsRestartTest.java @@ -87,14 +87,23 @@ public class PipeConfigNodeMetricsRestartTest { public void testConfigRegionSourceMetrics() { final PipeConfigRegionSourceMetrics metrics = PipeConfigRegionSourceMetrics.getInstance(); bind(metrics); - metrics.register(mockConfigRegionSource()); + final IoTDBConfigRegionSource source = mockConfigRegionSource(); + when(source.getTaskID()).thenReturn(PIPE + "_0_" + CREATION_TIME); + when(source.getUnTransferredEventCount()).thenReturn(7L); + metrics.register(source); try { + assertEquals(7L, metrics.getRemainingEventCount(PIPE, CREATION_TIME)); + assertEquals(0L, metrics.getRemainingEventCount(PIPE, CREATION_TIME + 1)); + assertEquals(0L, metrics.getRemainingEventCount("other_pipe", CREATION_TIME)); service.restartService(); assertEquals(1, count(Metric.UNTRANSFERRED_CONFIG_COUNT)); + when(source.getUnTransferredEventCount()).thenReturn(3L); + assertEquals(3L, metrics.getRemainingEventCount(PIPE, CREATION_TIME)); } finally { - metrics.deregister(TASK_ID); + metrics.deregister(source.getTaskID()); } assertEquals(0, count(Metric.UNTRANSFERRED_CONFIG_COUNT)); + assertEquals(0L, metrics.getRemainingEventCount(PIPE, CREATION_TIME)); } @Test
