YARN-1600. RM does not startup when security is enabled without spnego configured. Contributed by Haohui Mai

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1562482 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason Darrell Lowe 2014-01-29 15:30:04 +00:00
parent d9d8027eb3
commit 4de2bd3fbf
2 changed files with 6 additions and 1 deletions

View File

@ -562,6 +562,9 @@ Release 2.3.0 - UNRELEASED
YARN-1138. yarn.application.classpath is set to point to $HADOOP_CONF_DIR YARN-1138. yarn.application.classpath is set to point to $HADOOP_CONF_DIR
etc., which does not work on Windows. (Chuan Liu via cnauroth) etc., which does not work on Windows. (Chuan Liu via cnauroth)
YARN-1600. RM does not startup when security is enabled without spnego
configured (Haohui Mai via jlowe)
Release 2.2.0 - 2013-10-13 Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -223,7 +223,9 @@ public class WebApps {
.setPathSpec(pathList.toArray(new String[0])); .setPathSpec(pathList.toArray(new String[0]));
boolean hasSpnegoConf = spnegoPrincipalKey != null boolean hasSpnegoConf = spnegoPrincipalKey != null
&& spnegoKeytabKey != null; && conf.get(spnegoPrincipalKey) != null && spnegoKeytabKey != null
&& conf.get(spnegoKeytabKey) != null;
if (hasSpnegoConf) { if (hasSpnegoConf) {
builder.setUsernameConfKey(spnegoPrincipalKey) builder.setUsernameConfKey(spnegoPrincipalKey)
.setKeytabConfKey(spnegoKeytabKey) .setKeytabConfKey(spnegoKeytabKey)