Address review comments.

Author: szetszwo

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslMechanismFactory.java

@@ -17,7 +17,6 @@
  */
 package org.apache.hadoop.security;
 
-import org.apache.hadoop.HadoopIllegalArgumentException;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -49,14 +48,7 @@ private static synchronized String getSynchronously() {
         HADOOP_SECURITY_SASL_MECHANISM_DEFAULT);
     LOG.debug("{} = {} (conf)", HADOOP_SECURITY_SASL_MECHANISM_KEY, confValue);
 
-    if (envValue != null && confValue != null) {
-      if (!envValue.equals(confValue)) {
-        throw new HadoopIllegalArgumentException("SASL Mechanism mismatched: env "
-            + SASL_MECHANISM_ENV + " is " + envValue + " but conf "
-            + HADOOP_SECURITY_SASL_MECHANISM_KEY + " is " + confValue);
-      }
-    }
-
+    // env has a higher precedence than conf
     mechanism = envValue != null ? envValue
         : confValue != null ? confValue
         : HADOOP_SECURITY_SASL_MECHANISM_DEFAULT;
@@ -69,8 +61,8 @@ public static String getMechanism() {
     return value != null ? value : getSynchronously();
   }
 
-  public static boolean isDefaultMechanism(String mechanism) {
-    return HADOOP_SECURITY_SASL_MECHANISM_DEFAULT.equals(mechanism);
+  public static boolean isDefaultMechanism(String saslMechanism) {
+    return HADOOP_SECURITY_SASL_MECHANISM_DEFAULT.equals(saslMechanism);
   }
 
   private SaslMechanismFactory() {}

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java

@@ -241,8 +241,6 @@ private AuthMethod(byte code, String mechanismName) {
     AuthMethod(byte code, Supplier<String> mechanismName) {
       this.code = code;
       this.mechanismName = mechanismName;
-      LOG.debug("{} {}: code={}, mechanism=\"{}\"",
-          getClass().getSimpleName(), name(), code, mechanismName);
     }
 
     private static final int FIRST_CODE = values()[0].code;