Author: szetszwo
Date: Wed Feb 19 19:57:36 2014
New Revision: 1569890
URL: http://svn.apache.org/r1569890
Log:
Merge r1555021 through r1569889 from trunk.
Modified:
hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/ (props changed)
hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/CHANGES.txt
(props changed)
hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/conf/ (props
changed)
hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java
Propchange: hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project:r1547224-1569863
Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1569523-1569889
Propchange:
hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/CHANGES.txt:r1547224-1569863
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1569523-1569889
Propchange: hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/conf:r1547224-1569863
Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1555021-1569889
Propchange:
hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1565517-1569889
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1547224-1569863
Modified:
hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistoryServer.java
Wed Feb 19 19:57:36 2014
@@ -19,6 +19,7 @@
package org.apache.hadoop.mapreduce.v2.hs;
import java.io.IOException;
+import java.net.InetSocketAddress;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -169,8 +170,21 @@ public class JobHistoryServer extends Co
}
protected void doSecureLogin(Configuration conf) throws IOException {
+ InetSocketAddress socAddr = getBindAddress(conf);
SecurityUtil.login(conf, JHAdminConfig.MR_HISTORY_KEYTAB,
- JHAdminConfig.MR_HISTORY_PRINCIPAL);
+ JHAdminConfig.MR_HISTORY_PRINCIPAL, socAddr.getHostName());
+ }
+
+ /**
+ * Retrieve JHS bind address from configuration
+ *
+ * @param conf
+ * @return InetSocketAddress
+ */
+ public static InetSocketAddress getBindAddress(Configuration conf) {
+ return conf.getSocketAddr(JHAdminConfig.MR_HISTORY_ADDRESS,
+ JHAdminConfig.DEFAULT_MR_HISTORY_ADDRESS,
+ JHAdminConfig.DEFAULT_MR_HISTORY_PORT);
}
@Override
