Change spark.kafka.token.sasl.mechanism to spark.kafka.sasl.token.mec…

…hanism
apache · Dec 11, 2018 · de35aa2 · de35aa2
1 parent 1a6ae00
commit de35aa2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/scala/org/apache/spark/internal/config/Kafka.scala b/core/src/main/scala/org/apache/spark/internal/config/Kafka.scala
@@ -81,11 +81,11 @@ private[spark] object Kafka {
       .createOptional
 
   val TOKEN_SASL_MECHANISM =
-    ConfigBuilder("spark.kafka.token.sasl.mechanism")
+    ConfigBuilder("spark.kafka.sasl.token.mechanism")
       .doc("SASL mechanism used for client connections with delegation token. Because SCRAM " +
         "login module used for authentication a compatible mechanism has to be set here. " +
-        "For further details please see kafka documentation. Only used to authenticate against " +
-        "Kafka broker with delegation token.")
+        "For further details please see kafka documentation (sasl.mechanism). Only used to " +
+        "authenticate against Kafka broker with delegation token.")
       .stringConf
       .createWithDefault("SCRAM-SHA-512")
 }
diff --git a/docs/structured-streaming-kafka-integration.md b/docs/structured-streaming-kafka-integration.md
@@ -669,7 +669,7 @@ Kafka broker configuration):
 
 After obtaining delegation token successfully, Spark distributes it across nodes and renews it accordingly.
 Delegation token uses `SCRAM` login module for authentication and because of that the appropriate
-`spark.kafka.token.sasl.mechanism` (default: `SCRAM-SHA-512`) has to be configured. Also, this parameter
+`spark.kafka.sasl.token.mechanism` (default: `SCRAM-SHA-512`) has to be configured. Also, this parameter
 must match with Kafka broker configuration.
 
 When delegation token is available on an executor it can be overridden with JAAS login configuration.