root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

KAFKA-9980: Fix bug where alterClientQuotas could not set default client quotas (#8658) 

Reviewers: Colin P. McCabe <cmccabe@apache.org>
This commit is contained in:
Brian Byrne 2020-05-21 17:50:21 -07:00 committed by GitHub
parent 856e366512
commit d9e9a18a19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/scala/kafka/server/AdminManager.scala
View File

@ -714,16 +714,16 @@ class AdminManager(val config: KafkaConfig,
new DescribeConfigsResponse.ConfigEntry(name, valueAsString, source, isSensitive, readOnly, synonyms.asJava) new DescribeConfigsResponse.ConfigEntry(name, valueAsString, source, isSensitive, readOnly, synonyms.asJava)
} }
private def sanitizeEntityName(entityName: String): String = { private def sanitizeEntityName(entityName: String): String =
if (entityName == ConfigEntityName.Default) Option(entityName) match {
throw new InvalidRequestException(s"Entity name '${ConfigEntityName.Default}' is reserved") case None => ConfigEntityName.Default
Sanitizer.sanitize(Option(entityName).getOrElse(ConfigEntityName.Default)) case Some(name) => Sanitizer.sanitize(name)
} }
private def desanitizeEntityName(sanitizedEntityName: String): String = private def desanitizeEntityName(sanitizedEntityName: String): String =
Sanitizer.desanitize(sanitizedEntityName) match { sanitizedEntityName match {
case ConfigEntityName.Default => null case ConfigEntityName.Default => null
case name => name case name => Sanitizer.desanitize(name)
} }
private def entityToSanitizedUserClientId(entity: ClientQuotaEntity): (Option[String], Option[String]) = { private def entityToSanitizedUserClientId(entity: ClientQuotaEntity): (Option[String], Option[String]) = {

14
core/src/test/scala/unit/kafka/server/ClientQuotasRequestTest.scala
View File

@ -382,6 +382,20 @@ class ClientQuotasRequestTest extends BaseRequestTest {
)) ))
} }
@Test
def testClientQuotasWithDefaultName(): Unit = {
// An entity using the name associated with the default entity name. The entity's name should be sanitized so
// that it does not conflict with the default entity name.
val entity = new ClientQuotaEntity(Map((ClientQuotaEntity.CLIENT_ID -> ConfigEntityName.Default)).asJava)
alterEntityQuotas(entity, Map((ProducerByteRateProp -> Some(20000.0))), validateOnly = false)
verifyDescribeEntityQuotas(entity, Map((ProducerByteRateProp -> 20000.0)))
// This should not match.
val result = describeClientQuotas(
ClientQuotaFilter.containsOnly(List(ClientQuotaFilterComponent.ofDefaultEntity(ClientQuotaEntity.CLIENT_ID)).asJava))
assert(result.isEmpty)
}
private def verifyDescribeEntityQuotas(entity: ClientQuotaEntity, quotas: Map[String, Double]) = { private def verifyDescribeEntityQuotas(entity: ClientQuotaEntity, quotas: Map[String, Double]) = {
val components = entity.entries.asScala.map(e => ClientQuotaFilterComponent.ofEntity(e._1, e._2)) val components = entity.entries.asScala.map(e => ClientQuotaFilterComponent.ofEntity(e._1, e._2))
val describe = describeClientQuotas(ClientQuotaFilter.containsOnly(components.toList.asJava)) val describe = describeClientQuotas(ClientQuotaFilter.containsOnly(components.toList.asJava))