You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sa...@apache.org on 2025/05/14 10:53:55 UTC
(ignite-3) branch main updated: IGNITE-25123 Support metrics for the colocation track (#5809)
This is an automated email from the ASF dual-hosted git repository.
sanpwc pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 8de1545a72a IGNITE-25123 Support metrics for the colocation track (#5809)
8de1545a72a is described below
commit 8de1545a72aeec4895dafb816c610f5dbb178dce
Author: Cyrill <cy...@gmail.com>
AuthorDate: Wed May 14 13:53:49 2025 +0300
IGNITE-25123 Support metrics for the colocation track (#5809)
---
.../distributed/disaster/PartitionStatesMetricSource.java | 15 +++++++++++++++
.../internal/disaster/ItDisasterRecoveryMetricTest.java | 4 ----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/PartitionStatesMetricSource.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/PartitionStatesMetricSource.java
index 27bf4635af8..e678a51f549 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/PartitionStatesMetricSource.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/PartitionStatesMetricSource.java
@@ -29,6 +29,7 @@ import org.apache.ignite.internal.metrics.MetricSetBuilder;
import org.apache.ignite.internal.metrics.MetricSource;
import org.apache.ignite.internal.partition.replicator.network.disaster.LocalPartitionStateEnum;
import org.apache.ignite.internal.replicator.TablePartitionId;
+import org.apache.ignite.internal.replicator.ZonePartitionId;
import org.jetbrains.annotations.Nullable;
/** Source of metrics for table partition statuses. */
@@ -37,6 +38,8 @@ class PartitionStatesMetricSource implements MetricSource {
private final int tableId;
+ private final int zoneId;
+
private final DisasterRecoveryManager disasterRecoveryManager;
/** Enablement status. Accessed from different threads under synchronization on this object. */
@@ -47,6 +50,7 @@ class PartitionStatesMetricSource implements MetricSource {
DisasterRecoveryManager disasterRecoveryManager
) {
this.tableId = tableDescriptor.id();
+ this.zoneId = tableDescriptor.zoneId();
this.disasterRecoveryManager = disasterRecoveryManager;
metricSourceName = String.format("partition.states.zone.%s.table.%s", tableDescriptor.zoneId(), tableDescriptor.id());
@@ -122,6 +126,17 @@ class PartitionStatesMetricSource implements MetricSource {
LocalPartitionStateEnumWithLogIndex localPartitionStateWithLogIndex =
LocalPartitionStateEnumWithLogIndex.of(raftGroupService.getRaftNode());
+ if (localPartitionStateWithLogIndex.state == state) {
+ count[0]++;
+ }
+ }
+ } else if (raftNodeId.groupId() instanceof ZonePartitionId) {
+ var zonePartitionId = (ZonePartitionId) raftNodeId.groupId();
+
+ if (zonePartitionId.zoneId() == zoneId) {
+ LocalPartitionStateEnumWithLogIndex localPartitionStateWithLogIndex =
+ LocalPartitionStateEnumWithLogIndex.of(raftGroupService.getRaftNode());
+
if (localPartitionStateWithLogIndex.state == state) {
count[0]++;
}
diff --git a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryMetricTest.java b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryMetricTest.java
index 4844a5c63d3..2b5f8c2d338 100644
--- a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryMetricTest.java
+++ b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/disaster/ItDisasterRecoveryMetricTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.disaster;
import static java.util.stream.Collectors.toList;
import static org.apache.ignite.internal.TestWrappers.unwrapIgniteImpl;
-import static org.apache.ignite.internal.lang.IgniteSystemProperties.COLOCATION_FEATURE_FLAG;
import static org.apache.ignite.internal.metrics.exporters.jmx.JmxExporter.JMX_METRIC_GROUP;
import static org.apache.ignite.internal.util.IgniteUtils.makeMbeanName;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -40,13 +39,10 @@ import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.metrics.MetricSource;
import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
import org.apache.ignite.internal.sql.SqlCommon;
-import org.apache.ignite.internal.testframework.WithSystemProperty;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
/** For integration testing of disaster recovery metrics. */
-// TODO https://issues.apache.org/jira/browse/IGNITE-25123
-@WithSystemProperty(key = COLOCATION_FEATURE_FLAG, value = "false")
public class ItDisasterRecoveryMetricTest extends BaseSqlIntegrationTest {
public static final String SCHEMA_NAME = SqlCommon.DEFAULT_SCHEMA_NAME;