You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by tu...@apache.org on 2011/12/09 20:31:16 UTC
svn commit: r1212592 - in
/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/security/HadoopKerberosName.java
src/main/java/org/apache/hadoop/security/UserGroupInformation.java
Author: tucu
Date: Fri Dec 9 19:31:15 2011
New Revision: 1212592
URL: http://svn.apache.org/viewvc?rev=1212592&view=rev
Log:
Merge -r 1212590:1212591 from trunk to branch. FIXES: HADOOP-7902
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/HadoopKerberosName.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1212592&r1=1212591&r2=1212592&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Fri Dec 9 19:31:15 2011
@@ -71,9 +71,13 @@ Release 0.23.1 - Unreleased
HADOOP-7887. KerberosAuthenticatorHandler is not setting KerberosName
name rules from configuration. (tucu)
+
HADOOP-7870. fix SequenceFile#createWriter with boolean
createParent arg to respect createParent. (Jon Hsieh via eli)
+ HADOOP-7902. skipping name rules setting (if already set) should be done
+ on UGI initialization only. (tucu)
+
Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/HadoopKerberosName.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/HadoopKerberosName.java?rev=1212592&r1=1212591&r2=1212592&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/HadoopKerberosName.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/HadoopKerberosName.java Fri Dec 9 19:31:15 2011
@@ -65,10 +65,8 @@ public class HadoopKerberosName extends
* @throws IOException
*/
public static void setConfiguration(Configuration conf) throws IOException {
- if (!hasRulesBeenSet()) {
- String ruleString = conf.get("hadoop.security.auth_to_local", "DEFAULT");
- setRules(ruleString);
- }
+ String ruleString = conf.get("hadoop.security.auth_to_local", "DEFAULT");
+ setRules(ruleString);
}
public static void main(String[] args) throws Exception {
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1212592&r1=1212591&r2=1212592&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java Fri Dec 9 19:31:15 2011
@@ -57,6 +57,7 @@ import org.apache.hadoop.metrics2.annota
import org.apache.hadoop.metrics2.annotation.Metrics;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.metrics2.lib.MutableRate;
+import org.apache.hadoop.security.authentication.util.KerberosName;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.hadoop.util.Shell;
@@ -200,7 +201,7 @@ public class UserGroupInformation {
*/
private static synchronized void ensureInitialized() {
if (!isInitialized) {
- initialize(new Configuration());
+ initialize(new Configuration(), KerberosName.hasRulesBeenSet());
}
}
@@ -208,11 +209,13 @@ public class UserGroupInformation {
* Initialize UGI and related classes.
* @param conf the configuration to use
*/
- private static synchronized void initialize(Configuration conf) {
+ private static synchronized void initialize(Configuration conf, boolean skipRulesSetting) {
initUGI(conf);
// give the configuration on how to translate Kerberos names
try {
- HadoopKerberosName.setConfiguration(conf);
+ if (!skipRulesSetting) {
+ HadoopKerberosName.setConfiguration(conf);
+ }
} catch (IOException ioe) {
throw new RuntimeException("Problem with Kerberos auth_to_local name " +
"configuration", ioe);
@@ -249,7 +252,7 @@ public class UserGroupInformation {
* @param conf the configuration to use
*/
public static void setConfiguration(Configuration conf) {
- initialize(conf);
+ initialize(conf, false);
}
/**