remove the zk related metrics in ControllerMetadataMetrics

apache · Jan 19, 2025 · e9a0b8e · e9a0b8e
1 parent 2529adb
commit e9a0b8e
Showing 1 changed file with 2 additions and 44 deletions.
diff --git a/metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetadataMetrics.java b/metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetadataMetrics.java
@@ -42,8 +42,6 @@ public final class ControllerMetadataMetrics implements AutoCloseable {
         "KafkaController", "FencedBrokerCount");
     private static final MetricName ACTIVE_BROKER_COUNT = getMetricName(
         "KafkaController", "ActiveBrokerCount");
-    private static final MetricName MIGRATING_ZK_BROKER_COUNT = getMetricName(
-        "KafkaController", "MigratingZkBrokerCount");
     private static final MetricName GLOBAL_TOPIC_COUNT = getMetricName(
         "KafkaController", "GlobalTopicCount");
     private static final MetricName GLOBAL_PARTITION_COUNT = getMetricName(
@@ -54,21 +52,17 @@ public final class ControllerMetadataMetrics implements AutoCloseable {
         "KafkaController", "PreferredReplicaImbalanceCount");
     private static final MetricName METADATA_ERROR_COUNT = getMetricName(
         "KafkaController", "MetadataErrorCount");
-    private static final MetricName ZK_MIGRATION_STATE = getMetricName(
-        "KafkaController", "ZkMigrationState");
     private static final MetricName UNCLEAN_LEADER_ELECTIONS_PER_SEC = getMetricName(
         "ControllerStats", "UncleanLeaderElectionsPerSec");
 
     private final Optional<MetricsRegistry> registry;
     private final AtomicInteger fencedBrokerCount = new AtomicInteger(0);
     private final AtomicInteger activeBrokerCount = new AtomicInteger(0);
-    private final AtomicInteger migratingZkBrokerCount = new AtomicInteger(0);
     private final AtomicInteger globalTopicCount = new AtomicInteger(0);
     private final AtomicInteger globalPartitionCount = new AtomicInteger(0);
     private final AtomicInteger offlinePartitionCount = new AtomicInteger(0);
     private final AtomicInteger preferredReplicaImbalanceCount = new AtomicInteger(0);
     private final AtomicInteger metadataErrorCount = new AtomicInteger(0);
-    private final AtomicInteger zkMigrationState = new AtomicInteger(-1);
     private Optional<Meter> uncleanLeaderElectionMeter = Optional.empty();
 
 
@@ -121,20 +115,6 @@ public Integer value() {
                 return metadataErrorCount();
             }
         }));
-        registry.ifPresent(r -> r.newGauge(ZK_MIGRATION_STATE, new Gauge<Integer>() {
-            @Override
-            public Integer value() {
-                return (int) zkMigrationState();
-            }
-        }));
-
-        registry.ifPresent(r -> r.newGauge(MIGRATING_ZK_BROKER_COUNT, new Gauge<Integer>() {
-            @Override
-            public Integer value() {
-                return migratingZkBrokerCount();
-            }
-        }));
-
         registry.ifPresent(r -> uncleanLeaderElectionMeter =
                 Optional.of(registry.get().newMeter(UNCLEAN_LEADER_ELECTIONS_PER_SEC, "elections", TimeUnit.SECONDS)));
     }
@@ -162,19 +142,7 @@ public void addToActiveBrokerCount(int brokerCountDelta) {
     public int activeBrokerCount() {
         return this.activeBrokerCount.get();
     }
-
-    public void setMigratingZkBrokerCount(int brokerCount) {
-        this.migratingZkBrokerCount.set(brokerCount);
-    }
-
-    public void addToMigratingZkBrokerCount(int brokerCountDelta) {
-        this.migratingZkBrokerCount.addAndGet(brokerCountDelta);
-    }
-
-    public int migratingZkBrokerCount() {
-        return this.migratingZkBrokerCount.get();
-    }
-
+
     public void setGlobalTopicCount(int topicCount) {
         this.globalTopicCount.set(topicCount);
     }
@@ -230,15 +198,7 @@ public void incrementMetadataErrorCount() {
     public int metadataErrorCount() {
         return this.metadataErrorCount.get();
     }
-
-    public void setZkMigrationState(byte migrationStateValue) {
-        this.zkMigrationState.set(migrationStateValue);
-    }
-
-    public byte zkMigrationState() {
-        return zkMigrationState.byteValue();
-    }
-
+
     public void updateUncleanLeaderElection(int count) {
         this.uncleanLeaderElectionMeter.ifPresent(m -> m.mark(count));
     }
@@ -248,13 +208,11 @@ public void close() {
         registry.ifPresent(r -> Arrays.asList(
             FENCED_BROKER_COUNT,
             ACTIVE_BROKER_COUNT,
-            MIGRATING_ZK_BROKER_COUNT,
             GLOBAL_TOPIC_COUNT,
             GLOBAL_PARTITION_COUNT,
             OFFLINE_PARTITION_COUNT,
             PREFERRED_REPLICA_IMBALANCE_COUNT,
             METADATA_ERROR_COUNT,
-            ZK_MIGRATION_STATE,
             UNCLEAN_LEADER_ELECTIONS_PER_SEC
         ).forEach(r::removeMetric));
     }