[GitHub] [kafka] cmccabe commented on a diff in pull request #13438: KAFKA-14835: Create ControllerServerMetricsPublisher
cmccabe commented on code in PR #13438: URL: https://github.com/apache/kafka/pull/13438#discussion_r1146927689 ## core/src/main/scala/kafka/server/ControllerServer.scala: ## @@ -104,13 +106,15 @@ class ControllerServer( val socketServerFirstBoundPortFuture = new CompletableFuture[Integer]() var createTopicPolicy: Option[CreateTopicPolicy] = None var alterConfigPolicy: Option[AlterConfigPolicy] = None + @volatile var quorumControllerMetrics: QuorumControllerMetrics = _ var controller: Controller = _ var quotaManagers: QuotaManagers = _ var clientQuotaMetadataManager: ClientQuotaMetadataManager = _ var controllerApis: ControllerApis = _ var controllerApisHandlerPool: KafkaRequestHandlerPool = _ var migrationSupport: Option[ControllerMigrationSupport] = None def kafkaYammerMetrics: KafkaYammerMetrics = KafkaYammerMetrics.INSTANCE + val metadataPublishers: util.List[MetadataPublisher] = new CopyOnWriteArrayList[MetadataPublisher]() Review Comment: ok, I'll just use array list for now. -- 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: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [kafka] cmccabe commented on a diff in pull request #13438: KAFKA-14835: Create ControllerServerMetricsPublisher
cmccabe commented on code in PR #13438:
URL: https://github.com/apache/kafka/pull/13438#discussion_r1146914196
##
metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerServerMetrics.java:
##
@@ -0,0 +1,211 @@
+/*
+ * 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.kafka.controller.metrics;
+
+import com.yammer.metrics.core.Gauge;
+import com.yammer.metrics.core.MetricName;
+import com.yammer.metrics.core.MetricsRegistry;
+import org.apache.kafka.server.metrics.KafkaYammerMetrics;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * These are the metrics which are managed by the ControllerServer class. They
generally pertain to
+ * aspects of the metadata, like how many topics or partitions we have.
+ * All of these except MetadataErrorCount are managed by
ControllerServerMetricsPublisher.
+ *
+ * IMPORTANT: Metrics which are managed by the QuorumController class itself
should go in
+ * @link{org.apache.kafka.controller.metrics.QuorumControllerMetrics}, not
here.
+ */
+public final class ControllerServerMetrics implements AutoCloseable {
+private final static MetricName FENCED_BROKER_COUNT = getMetricName(
+"KafkaController", "FencedBrokerCount");
+private final static MetricName ACTIVE_BROKER_COUNT = getMetricName(
+"KafkaController", "ActiveBrokerCount");
+private final static MetricName GLOBAL_TOPIC_COUNT = getMetricName(
+"KafkaController", "GlobalTopicCount");
+private final static MetricName GLOBAL_PARTITION_COUNT = getMetricName(
+"KafkaController", "GlobalPartitionCount");
+private final static MetricName OFFLINE_PARTITION_COUNT = getMetricName(
+"KafkaController", "OfflinePartitionsCount");
+private final static MetricName PREFERRED_REPLICA_IMBALANCE_COUNT =
getMetricName(
+"KafkaController", "PreferredReplicaImbalanceCount");
+private final static MetricName METADATA_ERROR_COUNT = getMetricName(
+"KafkaController", "MetadataErrorCount");
+
+private final Optional registry;
+private final AtomicInteger fencedBrokerCount = new AtomicInteger(0);
+private final AtomicInteger activeBrokerCount = new AtomicInteger(0);
+private final AtomicInteger globalTopicCount = new AtomicInteger(0);
+private final AtomicInteger globalPartitionCount = new AtomicInteger();
+private final AtomicInteger offlinePartitionCount = new AtomicInteger();
+private final AtomicInteger preferredReplicaImbalanceCount = new
AtomicInteger();
+private final AtomicInteger metadataErrorCount = new AtomicInteger(0);
+
+/**
+ * Create a new ControllerServerMetrics object.
+ *
+ * @param registry The metrics registry, or Optional.empty if this is a
test and we don't have one.
+ */
+public ControllerServerMetrics(Optional registry) {
Review Comment:
Yeah. Looking at the previous code, I realized that `MockControllerMetrics`
was implementing all the same stuff as `QuorumControllerMetrics` (atomic adds,
atomic gets, etc.) So there was no point... just don't register with the
registry if you don't care about the registry, and you can avoid the whole
layer of abstraction.
--
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: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [kafka] cmccabe commented on a diff in pull request #13438: KAFKA-14835: Create ControllerServerMetricsPublisher
cmccabe commented on code in PR #13438:
URL: https://github.com/apache/kafka/pull/13438#discussion_r1146909450
##
metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerServerMetrics.java:
##
@@ -0,0 +1,211 @@
+/*
+ * 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.kafka.controller.metrics;
+
+import com.yammer.metrics.core.Gauge;
+import com.yammer.metrics.core.MetricName;
+import com.yammer.metrics.core.MetricsRegistry;
+import org.apache.kafka.server.metrics.KafkaYammerMetrics;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * These are the metrics which are managed by the ControllerServer class. They
generally pertain to
+ * aspects of the metadata, like how many topics or partitions we have.
+ * All of these except MetadataErrorCount are managed by
ControllerServerMetricsPublisher.
+ *
+ * IMPORTANT: Metrics which are managed by the QuorumController class itself
should go in
+ * @link{org.apache.kafka.controller.metrics.QuorumControllerMetrics}, not
here.
+ */
+public final class ControllerServerMetrics implements AutoCloseable {
+private final static MetricName FENCED_BROKER_COUNT = getMetricName(
+"KafkaController", "FencedBrokerCount");
+private final static MetricName ACTIVE_BROKER_COUNT = getMetricName(
+"KafkaController", "ActiveBrokerCount");
+private final static MetricName GLOBAL_TOPIC_COUNT = getMetricName(
+"KafkaController", "GlobalTopicCount");
+private final static MetricName GLOBAL_PARTITION_COUNT = getMetricName(
+"KafkaController", "GlobalPartitionCount");
+private final static MetricName OFFLINE_PARTITION_COUNT = getMetricName(
+"KafkaController", "OfflinePartitionsCount");
+private final static MetricName PREFERRED_REPLICA_IMBALANCE_COUNT =
getMetricName(
+"KafkaController", "PreferredReplicaImbalanceCount");
+private final static MetricName METADATA_ERROR_COUNT = getMetricName(
+"KafkaController", "MetadataErrorCount");
+
+private final Optional registry;
+private final AtomicInteger fencedBrokerCount = new AtomicInteger(0);
+private final AtomicInteger activeBrokerCount = new AtomicInteger(0);
+private final AtomicInteger globalTopicCount = new AtomicInteger(0);
+private final AtomicInteger globalPartitionCount = new AtomicInteger();
Review Comment:
Good point. I changed them all to just use `new AtomicInteger(0)` to be
explicit. The no-argument form defaults to 0 too but better to avoid that bit
of cleverness
--
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: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [kafka] cmccabe commented on a diff in pull request #13438: KAFKA-14835: Create ControllerServerMetricsPublisher
cmccabe commented on code in PR #13438:
URL: https://github.com/apache/kafka/pull/13438#discussion_r1146908247
##
metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerServerMetricsPublisher.java:
##
@@ -0,0 +1,156 @@
+/*
+ * 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.kafka.controller.metrics;
+
+import org.apache.kafka.common.Uuid;
+import org.apache.kafka.image.MetadataDelta;
+import org.apache.kafka.image.MetadataImage;
+import org.apache.kafka.image.TopicDelta;
+import org.apache.kafka.image.TopicImage;
+import org.apache.kafka.image.loader.LoaderManifest;
+import org.apache.kafka.image.publisher.MetadataPublisher;
+import org.apache.kafka.metadata.BrokerRegistration;
+import org.apache.kafka.metadata.PartitionRegistration;
+import org.apache.kafka.server.fault.FaultHandler;
+
+import java.util.Map.Entry;
+import java.util.Optional;
+
+
+/**
+ * This publisher translates metadata updates sent by MetadataLoader into
changes to controller
+ * metrics. Like all MetadataPublisher objects, it only receives notifications
about events that
+ * have been persisted to the metadata log. So on the active controller, it
will run slightly
+ * behind the latest in-memory state which has not yet been fully persisted to
the log. This is
+ * reasonable for metrics, which don't need up-to-the-millisecond update
latency.
+ *
+ * NOTE: the ZK controller has some special rules for calculating
preferredReplicaImbalanceCount
+ * which we haven't implemented here. Specifically, the ZK controller
considers reassigning
+ * partitions to always have their preferred leader, even if they don't.
+ * All other metrics should be the same, as far as is possible.
+ */
+public class ControllerServerMetricsPublisher implements MetadataPublisher {
Review Comment:
Good idea. I renamed:
ControllerServerMetrics -> ControllerMetadataMetrics
ControllerServerMetricsPublisher -> ControllerMetadataMetricsPublisher
and associated tests
--
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: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [kafka] cmccabe commented on a diff in pull request #13438: KAFKA-14835: Create ControllerServerMetricsPublisher
cmccabe commented on code in PR #13438:
URL: https://github.com/apache/kafka/pull/13438#discussion_r1146902273
##
metadata/src/main/java/org/apache/kafka/controller/metrics/ControllerMetricsChanges.java:
##
@@ -0,0 +1,147 @@
+/*
+ * 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.kafka.controller.metrics;
+
+import org.apache.kafka.image.TopicDelta;
+import org.apache.kafka.image.TopicImage;
+import org.apache.kafka.metadata.BrokerRegistration;
+import org.apache.kafka.metadata.PartitionRegistration;
+
+import java.util.Map.Entry;
+
+
+class ControllerMetricsChanges {
+static int delta(boolean prev, boolean next) {
Review Comment:
I added a JavaDoc
--
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: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [kafka] cmccabe commented on a diff in pull request #13438: KAFKA-14835: Create ControllerServerMetricsPublisher
cmccabe commented on code in PR #13438: URL: https://github.com/apache/kafka/pull/13438#discussion_r1146899679 ## core/src/main/scala/kafka/server/ControllerServer.scala: ## @@ -366,6 +376,8 @@ class ControllerServer( // Ensure that we're not the Raft leader prior to shutting down our socket server, for a // smoother transition. sharedServer.ensureNotRaftLeader() + metadataPublishers.forEach(p => sharedServer.loader.removeAndClosePublisher(p).get()) Review Comment: I would like to do this eventually, but we don't have any shutdown timeout currently. We would have to add something like that in order to use it here. -- 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: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
