Author: todd
Date: Wed May 11 22:48:43 2011
New Revision: 1102122
URL: http://svn.apache.org/viewvc?rev=1102122&view=rev
Log:
HADOOP-7189. Add ability to enable debug property in JAAS configuration.
Contributed by Ted Yu.
Modified:
hadoop/common/branches/branch-0.22/CHANGES.txt
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/security/UserGroupInformation.java
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1102122&r1=1102121&r2=1102122&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Wed May 11 22:48:43 2011
@@ -232,6 +232,9 @@ Release 0.22.0 - Unreleased
HADOOP-7244. Documentation change for updated configuration keys.
(tomwhite via eli)
+ HADOOP-7189. Add ability to enable 'debug' property in JAAS configuration.
+ (Ted Yu via todd)
+
OPTIMIZATIONS
HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..).
Modified:
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/security/UserGroupInformation.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1102122&r1=1102121&r2=1102122&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/security/UserGroupInformation.java
(original)
+++
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/security/UserGroupInformation.java
Wed May 11 22:48:43 2011
@@ -362,15 +362,24 @@ public class UserGroupInformation {
"hadoop-user-kerberos";
private static final String KEYTAB_KERBEROS_CONFIG_NAME =
"hadoop-keytab-kerberos";
+
+ private static final Map<String, String> BASIC_JAAS_OPTIONS =
+ new HashMap<String,String>();
+ static {
+ String jaasEnvVar = System.getenv("HADOOP_JAAS_DEBUG");
+ if (jaasEnvVar != null && "true".equalsIgnoreCase(jaasEnvVar)) {
+ BASIC_JAAS_OPTIONS.put("debug", "true");
+ }
+ }
private static final AppConfigurationEntry OS_SPECIFIC_LOGIN =
new AppConfigurationEntry(OS_LOGIN_MODULE_NAME,
LoginModuleControlFlag.REQUIRED,
- new HashMap<String,String>());
+ BASIC_JAAS_OPTIONS);
private static final AppConfigurationEntry HADOOP_LOGIN =
new AppConfigurationEntry(HadoopLoginModule.class.getName(),
LoginModuleControlFlag.REQUIRED,
- new HashMap<String,String>());
+ BASIC_JAAS_OPTIONS);
private static final Map<String,String> USER_KERBEROS_OPTIONS =
new HashMap<String,String>();
static {
@@ -381,6 +390,7 @@ public class UserGroupInformation {
if (ticketCache != null) {
USER_KERBEROS_OPTIONS.put("ticketCache", ticketCache);
}
+ USER_KERBEROS_OPTIONS.putAll(BASIC_JAAS_OPTIONS);
}
private static final AppConfigurationEntry USER_KERBEROS_LOGIN =
new AppConfigurationEntry(Krb5LoginModule.class.getName(),
@@ -393,6 +403,7 @@ public class UserGroupInformation {
KEYTAB_KERBEROS_OPTIONS.put("useKeyTab", "true");
KEYTAB_KERBEROS_OPTIONS.put("storeKey", "true");
KEYTAB_KERBEROS_OPTIONS.put("refreshKrb5Config", "true");
+ KEYTAB_KERBEROS_OPTIONS.putAll(BASIC_JAAS_OPTIONS);
}
private static final AppConfigurationEntry KEYTAB_KERBEROS_LOGIN =
new AppConfigurationEntry(Krb5LoginModule.class.getName(),
