You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by vi...@apache.org on 2013/08/27 01:01:48 UTC
svn commit: r1517723 - in
/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn:
hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/
hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/
hadoop-yarn-server/hadoop-yarn...
Author: vinodkv
Date: Mon Aug 26 23:01:47 2013
New Revision: 1517723
URL: http://svn.apache.org/r1517723
Log:
YARN-1085. Addendum patch to address issues with the earlier patch.
svn merge --ignore-ancestry -c 1517721 ../../trunk/
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java?rev=1517723&r1=1517722&r2=1517723&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java Mon Aug 26 23:01:47 2013
@@ -214,11 +214,13 @@ public class YarnConfiguration extends C
public static final String RM_KEYTAB =
RM_PREFIX + "keytab";
+ /**The kerberos principal to be used for spnego filter for RM.*/
public static final String RM_WEBAPP_SPNEGO_USER_NAME_KEY =
RM_PREFIX + "webapp.spnego-principal";
- public static final String RM_WEBAPP_SPENGO_KEYTAB_FILE_KEY =
- RM_PREFIX + "webapp.spengo-keytab-file";
+ /**The kerberos keytab to be used for spnego filter for RM.*/
+ public static final String RM_WEBAPP_SPNEGO_KEYTAB_FILE_KEY =
+ RM_PREFIX + "webapp.spnego-keytab-file";
/** How long to wait until a container is considered dead.*/
public static final String RM_CONTAINER_ALLOC_EXPIRY_INTERVAL_MS =
@@ -615,9 +617,11 @@ public class YarnConfiguration extends C
public static final String NM_USER_HOME_DIR =
NM_PREFIX + "user-home-dir";
+ /**The kerberos principal to be used for spnego filter for NM.*/
public static final String NM_WEBAPP_SPNEGO_USER_NAME_KEY =
NM_PREFIX + "webapp.spnego-principal";
+ /**The kerberos keytab to be used for spnego filter for NM.*/
public static final String NM_WEBAPP_SPNEGO_KEYTAB_FILE_KEY =
NM_PREFIX + "webapp.spnego-keytab-file";
@@ -750,12 +754,6 @@ public class YarnConfiguration extends C
// Other Configs
////////////////////////////////
- public static final String JHS_WEBAPP_SPNEGO_USER_NAME_KEY =
- "jobhistoryserver.webapp.spnego-principal";
-
- public static final String JHS_WEBAPP_SPNEGO_KEYTAB_FILE_KEY =
- "jobhistoryserver.webapp.spnego-keytab-file";
-
/**
* The interval of the yarn client's querying application state after
* application submission. The unit is millisecond.
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java?rev=1517723&r1=1517722&r2=1517723&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java Mon Aug 26 23:01:47 2013
@@ -217,11 +217,13 @@ public class WebApps {
{
if (UserGroupInformation.isSecurityEnabled()) {
boolean initSpnego = true;
- if (spnegoPrincipalKey == null || spnegoPrincipalKey.isEmpty()) {
+ if (spnegoPrincipalKey == null
+ || conf.get(spnegoPrincipalKey, "").isEmpty()) {
LOG.warn("Principal for spnego filter is not set");
initSpnego = false;
}
- if (spnegoKeytabKey == null || spnegoKeytabKey.isEmpty()) {
+ if (spnegoKeytabKey == null
+ || conf.get(spnegoKeytabKey, "").isEmpty()) {
LOG.warn("Keytab for spnego filter is not set");
initSpnego = false;
}
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java?rev=1517723&r1=1517722&r2=1517723&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java Mon Aug 26 23:01:47 2013
@@ -584,7 +584,7 @@ public class ResourceManager extends Com
.withHttpSpnegoPrincipalKey(
YarnConfiguration.RM_WEBAPP_SPNEGO_USER_NAME_KEY)
.withHttpSpnegoKeytabKey(
- YarnConfiguration.RM_WEBAPP_SPENGO_KEYTAB_FILE_KEY)
+ YarnConfiguration.RM_WEBAPP_SPNEGO_KEYTAB_FILE_KEY)
.at(this.conf.get(YarnConfiguration.RM_WEBAPP_ADDRESS,
YarnConfiguration.DEFAULT_RM_WEBAPP_ADDRESS));
String proxyHostAndPort = YarnConfiguration.getProxyHostAndPort(conf);