From 986b03fecf35df8841cfb5a5f5cbb1ffc95875c6 Mon Sep 17 00:00:00 2001 From: Ron Dagostino Date: Sun, 4 Oct 2020 16:01:08 -0400 Subject: [PATCH 1/2] MINOR: Fix failing test due to KAFKA-10556 PR --- core/src/test/scala/integration/kafka/api/MetricsTest.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/test/scala/integration/kafka/api/MetricsTest.scala b/core/src/test/scala/integration/kafka/api/MetricsTest.scala index 5e92eca7afc31..d983541a1c9d9 100644 --- a/core/src/test/scala/integration/kafka/api/MetricsTest.scala +++ b/core/src/test/scala/integration/kafka/api/MetricsTest.scala @@ -26,6 +26,7 @@ import org.apache.kafka.common.config.SaslConfigs import org.apache.kafka.common.errors.InvalidTopicException import org.apache.kafka.common.network.ListenerName import org.apache.kafka.common.security.auth.SecurityProtocol +import org.apache.kafka.common.security.authenticator.TestJaasConfig import org.junit.{After, Before, Test} import org.junit.Assert._ import org.scalatest.Assertions.fail @@ -114,7 +115,8 @@ class MetricsTest extends IntegrationTestHarness with SaslSetup { private def generateAuthenticationFailure(tp: TopicPartition): Unit = { val saslProps = new Properties() // Temporary limit to reduce blocking before KIP-152 client-side changes are merged - saslProps.put(SaslConfigs.SASL_MECHANISM, "SCRAM-SHA-256") + saslProps.put(SaslConfigs.SASL_MECHANISM, kafkaClientSaslMechanism) + saslProps.put(SaslConfigs.SASL_JAAS_CONFIG, TestJaasConfig.jaasConfigProperty(kafkaClientSaslMechanism, "badUser", "badPass")) // Use acks=0 to verify error metric when connection is closed without a response val producer = TestUtils.createProducer(brokerList, acks = 0, From e822e7b18052f977b8ec17b3bdbbbc88b5483fc9 Mon Sep 17 00:00:00 2001 From: Ron Dagostino Date: Mon, 5 Oct 2020 09:16:00 -0400 Subject: [PATCH 2/2] Remove ineffective comment as per review --- core/src/test/scala/integration/kafka/api/MetricsTest.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/test/scala/integration/kafka/api/MetricsTest.scala b/core/src/test/scala/integration/kafka/api/MetricsTest.scala index d983541a1c9d9..6c90362049c5c 100644 --- a/core/src/test/scala/integration/kafka/api/MetricsTest.scala +++ b/core/src/test/scala/integration/kafka/api/MetricsTest.scala @@ -114,7 +114,6 @@ class MetricsTest extends IntegrationTestHarness with SaslSetup { // Create a producer that fails authentication to verify authentication failure metrics private def generateAuthenticationFailure(tp: TopicPartition): Unit = { val saslProps = new Properties() - // Temporary limit to reduce blocking before KIP-152 client-side changes are merged saslProps.put(SaslConfigs.SASL_MECHANISM, kafkaClientSaslMechanism) saslProps.put(SaslConfigs.SASL_JAAS_CONFIG, TestJaasConfig.jaasConfigProperty(kafkaClientSaslMechanism, "badUser", "badPass")) // Use acks=0 to verify error metric when connection is closed without a response