Repository: hadoop Updated Branches: refs/heads/branch-2 08a50da95 -> 8d3d7fa1c
YARN-7630. Fix AMRMToken rollover handling in AMRMProxy. Contributed by Botong Huang. (cherry picked from commit 17ba74be29193ac15474f73baaaf4e647a95078b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8d3d7fa1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8d3d7fa1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8d3d7fa1 Branch: refs/heads/branch-2 Commit: 8d3d7fa1c5fda4ec394b2f64baf1008e7b0d9524 Parents: 08a50da Author: Subru Krishnan <su...@apache.org> Authored: Thu Dec 14 14:03:55 2017 -0800 Committer: Subru Krishnan <su...@apache.org> Committed: Thu Dec 14 14:07:44 2017 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/server/utils/AMRMClientUtils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d3d7fa1/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/AMRMClientUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/AMRMClientUtils.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/AMRMClientUtils.java index e1f08e3..5a380c7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/AMRMClientUtils.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/AMRMClientUtils.java @@ -163,8 +163,12 @@ public final class AMRMClientUtils { LOG.info("Creating RMProxy to RM {} for protocol {} for user {}", rmClusterId, protocol.getSimpleName(), user); if (token != null) { - token.setService(ClientRMProxy.getAMRMTokenService(configuration)); + // preserve the token service sent by the RM when adding the token + // to ensure we replace the previous token setup by the RM. + // Afterwards we can update the service address for the RPC layer. + // Same as YarnServerSecurityUtils.updateAMRMToken() user.addToken(token); + token.setService(ClientRMProxy.getAMRMTokenService(configuration)); setAuthModeInConf(configuration); } final T proxyConnection = user.doAs(new PrivilegedExceptionAction<T>() { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
