splett2 commented on a change in pull request #9386:
URL: https://github.com/apache/kafka/pull/9386#discussion_r526527000
##########
File path: core/src/main/scala/kafka/network/SocketServer.scala
##########
@@ -1324,7 +1404,60 @@ class ConnectionQuotas(config: KafkaConfig, time: Time,
metrics: Metrics) extend
private[network] def updateBrokerMaxConnectionRate(maxConnectionRate: Int):
Unit = {
// if there is a connection waiting on the rate throttle delay, we will
let it wait the original delay even if
// the rate limit increases, because it is just one connection per
listener and the code is simpler that way
- updateConnectionRateQuota(maxConnectionRate)
+ updateConnectionRateQuota(maxConnectionRate, BrokerQuotaEntity)
+ }
+
+ /**
+ * Update the connection rate quota for a given IP and updates quota configs
for updated IPs.
+ * If an IP is given, metric config will be updated only for the given IP,
otherwise
+ * all metric configs will be checked and updated if required.
+ *
+ * @param ip ip to update or default if None
+ * @param maxConnectionRate new connection rate, or resets entity to default
if None
+ */
+ def updateIpConnectionRateQuota(ip: Option[InetAddress], maxConnectionRate:
Option[Int]): Unit = synchronized {
+ def isIpConnectionRateMetric(metricName: MetricName) = {
+ metricName.name == ConnectionRateMetricName &&
+ metricName.group == MetricsGroup &&
+ metricName.tags.containsKey(IpMetricTag)
+ }
+
+ def shouldUpdateQuota(metric: KafkaMetric, quotaLimit: Int) = {
+ quotaLimit != metric.config.quota.bound
+ }
+ ip match {
+ case Some(address) =>
+ counts.synchronized {
+ maxConnectionRate match {
+ case Some(rate) =>
+ info(s"Updating max connection rate override for $address to
$rate")
+ connectionRatePerIp.put(address, rate)
+ case None =>
+ info(s"Removing max connection rate override for $address")
+ connectionRatePerIp.remove(address)
+ }
+ }
+ updateConnectionRateQuota(connectionRateForIp(address),
IpQuotaEntity(address))
+ case None =>
+ counts.synchronized {
+ defaultConnectionRatePerIp =
maxConnectionRate.getOrElse(DynamicConfig.Ip.DefaultConnectionCreationRate)
+ }
+ info(s"Updated default max IP connection rate to
$defaultConnectionRatePerIp")
+ metrics.metrics.forEach { (metricName, metric) =>
+ if (isIpConnectionRateMetric(metricName)) {
+ val quota =
connectionRateForIp(InetAddress.getByName(metricName.tags.get(IpMetricTag)))
Review comment:
reasons for using `InetAddress` would be that it's more consistent with
the other IP-related data structures in `ConnectionQuotas`,
`maxConnectionsPerIpOverrides` and `counts`.
additionally, `inc()` is called with an `InetAddress`, so it's convenient to
keep our data structure using `InetAddress` as a key so that we don't need to
convert `InetAddress` => `String` in cases where we would skip creating a
sensor (e.g., when IP quotas are disabled).
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
