KAFKA-19817 Move DynamicTopicClusterQuotaPublisher to metadata module #20783
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * 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.metadata.publisher; | ||
|
|
||
| import org.apache.kafka.common.Cluster; | ||
| import org.apache.kafka.image.MetadataDelta; | ||
| import org.apache.kafka.image.MetadataImage; | ||
| import org.apache.kafka.image.loader.LoaderManifest; | ||
| import org.apache.kafka.image.publisher.MetadataPublisher; | ||
| import org.apache.kafka.metadata.MetadataCache; | ||
| import org.apache.kafka.server.fault.FaultHandler; | ||
|
|
||
| public class DynamicTopicClusterQuotaPublisher implements MetadataPublisher { | ||
| private final String clusterId; | ||
| private final Integer nodeId; | ||
| private final FaultHandler faultHandler; | ||
| private final String nodeType; | ||
| private final QuotaManagersProvider quotaManagersProvider; | ||
|
|
||
| public DynamicTopicClusterQuotaPublisher( | ||
| String clusterId, | ||
| Integer nodeId, | ||
| FaultHandler faultHandler, | ||
| String nodeType, | ||
| QuotaManagersProvider quotaManagers | ||
|
Member
There was a problem hiding this comment. Could you consider de-coupling those components by using lambda function? for example: public DynamicTopicClusterQuotaPublisher(
String clusterId,
int nodeId,
FaultHandler faultHandler,
String nodeType,
Plugin<ClientQuotaCallback> clientQuotaCallbackPlugin,
Runnable updateQuotaMetricConfigs
) {
this.clusterId = clusterId;
this.nodeId = nodeId;
this.faultHandler = faultHandler;
this.nodeType = nodeType;
this.clientQuotaCallbackPlugin = clientQuotaCallbackPlugin;
this.updateQuotaMetricConfigs = updateQuotaMetricConfigs;
}
@Override
public String name() {
return "DynamicTopicClusterQuotaPublisher " + nodeType + " id=" + nodeId;
}
@Override
public void onMetadataUpdate(MetadataDelta delta, MetadataImage newImage, LoaderManifest manifest) {
try {
if (delta.topicsDelta() != null || delta.clusterDelta() != null) {
Cluster cluster = MetadataCache.toCluster(clusterId, newImage);
if (clientQuotaCallbackPlugin.get().updateClusterMetadata(cluster)) {
updateQuotaMetricConfigs.run();
}
}
} catch (Exception e) {
String deltaName = "MetadataDelta up to " + newImage.highestOffsetAndEpoch().offset();
faultHandler.handleFault("Uncaught exception while publishing dynamic topic or cluster changes from " + deltaName, e);
}
}
@JimmyWang6 WDYT?
Contributor
Author
There was a problem hiding this comment. Hi @chia7712 , public class DynamicTopicClusterQuotaPublisher implements MetadataPublisher {
private final FaultHandler faultHandler;
private final String nodeType;
private final Runnable updateQuotaMetricConfigs;
public DynamicTopicClusterQuotaPublisher(
FaultHandler faultHandler,
String nodeType,
Runnable updateQuotaMetricConfigs
) {
this.faultHandler = faultHandler;
this.nodeType = nodeType;
this.updateQuotaMetricConfigs = updateQuotaMetricConfigs;
}
@Override
public String name() {
return "DynamicTopicClusterQuotaPublisher " + nodeType;
}
@Override
public void onMetadataUpdate(MetadataDelta delta, MetadataImage newImage, LoaderManifest manifest) {
try {
if (delta.topicsDelta() != null || delta.clusterDelta() != null) {
updateQuotaMetricConfigs.run();
}
} catch (Exception e) {
String deltaName = "MetadataDelta up to " + newImage.highestOffsetAndEpoch().offset();
faultHandler.handleFault("Uncaught exception while publishing dynamic topic or cluster changes from " + deltaName, e);
}
}
}And the logic of the original
Member
There was a problem hiding this comment. yes but |
||
| ) { | ||
| this.clusterId = clusterId; | ||
| this.nodeId = nodeId; | ||
| this.faultHandler = faultHandler; | ||
| this.nodeType = nodeType; | ||
| this.quotaManagersProvider = quotaManagers; | ||
| } | ||
|
|
||
| @Override | ||
| public String name() { | ||
| return "DynamicTopicClusterQuotaPublisher " + nodeType + " id=" + nodeId; | ||
| } | ||
|
|
||
| @Override | ||
| public void onMetadataUpdate(MetadataDelta delta, MetadataImage newImage, LoaderManifest manifest) { | ||
| onMetadataUpdate(delta, newImage); | ||
| } | ||
|
|
||
| public void onMetadataUpdate(MetadataDelta delta, MetadataImage newImage) { | ||
JimmyWang6 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| try { | ||
| quotaManagersProvider.clientQuotaCallbackPlugin().ifPresent(plugin -> { | ||
| if (delta.topicsDelta() != null || delta.clusterDelta() != null) { | ||
| Cluster cluster = MetadataCache.toCluster(clusterId, newImage); | ||
| if (plugin.get().updateClusterMetadata(cluster)) { | ||
|
Member
There was a problem hiding this comment. The necessity of this method is being discussed in KIP-1200. While I hope the vote succeeds, there is no harm in migrating the code though |
||
| quotaManagersProvider.fetch().updateQuotaMetricConfigs(); | ||
| quotaManagersProvider.produce().updateQuotaMetricConfigs(); | ||
| quotaManagersProvider.request().updateQuotaMetricConfigs(); | ||
| quotaManagersProvider.controllerMutation().updateQuotaMetricConfigs(); | ||
| } | ||
| } | ||
| }); | ||
| } catch (Exception e) { | ||
| String deltaName = "MetadataDelta up to " + newImage.highestOffsetAndEpoch().offset(); | ||
| faultHandler.handleFault("Uncaught exception while publishing dynamic topic or cluster changes from " + deltaName, e); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * 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.metadata.publisher; | ||
|
|
||
| import org.apache.kafka.common.internals.Plugin; | ||
| import org.apache.kafka.server.quota.ClientQuotaCallback; | ||
| import org.apache.kafka.server.quota.ClientQuotaManager; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| /** | ||
| * Interface to provide access to quota managers for metadata publishers. | ||
| * This abstraction allows the metadata module to access quota managers without | ||
| * directly depending on the core module. | ||
| */ | ||
| public interface QuotaManagersProvider { | ||
| ClientQuotaManager fetch(); | ||
|
|
||
| ClientQuotaManager produce(); | ||
|
|
||
| ClientQuotaManager request(); | ||
|
|
||
| ClientQuotaManager controllerMutation(); | ||
|
|
||
| Optional<Plugin<ClientQuotaCallback>> clientQuotaCallbackPlugin(); | ||
| } |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.