Repository: hadoop Updated Branches: refs/heads/trunk 5633da2a0 -> 469ea3dce
YARN-2538. Added logs when RM sends roll-overed AMRMToken to AM. Contributed by Xuan Gong. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/469ea3dc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/469ea3dc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/469ea3dc Branch: refs/heads/trunk Commit: 469ea3dcef6e427d02fd08b859b2789cc25189f9 Parents: 5633da2 Author: Zhijie Shen <zjs...@apache.org> Authored: Thu Sep 11 22:19:00 2014 -0700 Committer: Zhijie Shen <zjs...@apache.org> Committed: Thu Sep 11 22:19:00 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/ApplicationMasterService.java | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/469ea3dc/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 570a855..c5f5cb0 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -208,6 +208,9 @@ Release 2.6.0 - UNRELEASED YARN-2448. Changed ApplicationMasterProtocol to expose RM-recognized resource types to the AMs. (Varun Vasudev via vinodkv) + YARN-2538. Added logs when RM sends roll-overed AMRMToken to AM. (Xuan Gong + via zjshen) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/469ea3dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java index e6d878a..707cf1b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java @@ -581,6 +581,8 @@ public class ApplicationMasterService extends AbstractService implements .newInstance(amrmToken.getIdentifier(), amrmToken.getKind() .toString(), amrmToken.getPassword(), amrmToken.getService() .toString())); + LOG.info("The AMRMToken has been rolled-over. Send new AMRMToken back" + + " to application: " + appAttemptId.getApplicationId()); } /*