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 ju...@apache.org on 2016/11/30 00:50:24 UTC
hadoop git commit: MAPREDUCE-6565. Configuration to use host name in
delegation token service is not read from job.xml during MapReduce job
execution. Contributed by Li Lu. (cherry picked from commit
8f6e14399a3e77e1bdcc5034f7601e9f62163dea)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 c22ceb0a9 -> 376a2439d
MAPREDUCE-6565. Configuration to use host name in delegation token service is not read from job.xml during MapReduce job execution. Contributed by Li Lu.
(cherry picked from commit 8f6e14399a3e77e1bdcc5034f7601e9f62163dea)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/376a2439
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/376a2439
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/376a2439
Branch: refs/heads/branch-2
Commit: 376a2439db9cd55ed1f2965cd876b811109990ba
Parents: c22ceb0
Author: Junping Du <ju...@apache.org>
Authored: Tue Nov 29 15:51:27 2016 -0800
Committer: Junping Du <ju...@apache.org>
Committed: Tue Nov 29 16:50:17 2016 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/mapred/YarnChild.java | 2 ++
.../main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java | 3 +++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/376a2439/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnChild.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnChild.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnChild.java
index 164f19d..97642a5 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnChild.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/YarnChild.java
@@ -78,6 +78,8 @@ class YarnChild {
// Initing with our JobConf allows us to avoid loading confs twice
Limits.init(job);
UserGroupInformation.setConfiguration(job);
+ // MAPREDUCE-6565: need to set configuration for SecurityUtil.
+ SecurityUtil.setConfiguration(job);
String host = args[0];
int port = Integer.parseInt(args[1]);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/376a2439/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
index ce1483c..f64d087 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
@@ -121,6 +121,7 @@ import org.apache.hadoop.mapreduce.v2.util.MRBuilderUtils;
import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.security.Credentials;
+import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.service.AbstractService;
@@ -1654,6 +1655,8 @@ public class MRAppMaster extends CompositeService {
final JobConf conf, String jobUserName) throws IOException,
InterruptedException {
UserGroupInformation.setConfiguration(conf);
+ // MAPREDUCE-6565: need to set configuration for SecurityUtil.
+ SecurityUtil.setConfiguration(conf);
// Security framework already loaded the tokens into current UGI, just use
// them
Credentials credentials =
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org