YARN-2794. Fixed log messages about distributing system-credentials. Contributed by Jian He.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/be7bf956 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/be7bf956 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/be7bf956 Branch: refs/heads/HDFS-EC Commit: be7bf956e96dd0fd9b521ca71df9124b9cc5ebd0 Parents: 51957ca Author: Zhijie Shen <[email protected]> Authored: Wed Nov 12 11:07:57 2014 -0800 Committer: Zhijie Shen <[email protected]> Committed: Wed Nov 12 11:07:57 2014 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/server/nodemanager/NodeManager.java | 2 +- .../hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java | 5 ++++- .../localizer/ResourceLocalizationService.java | 6 +++--- .../containermanager/logaggregation/AppLogAggregatorImpl.java | 7 ++++--- 5 files changed, 15 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/be7bf956/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index f869fde..1f991f6 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -949,6 +949,9 @@ Release 2.6.0 - 2014-11-15 YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so as to make them work correctly. (Wangda Tan via vinodkv) + YARN-2794. Fixed log messages about distributing system-credentials. (Jian He via + zjshen) + Release 2.5.2 - 2014-11-10 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/be7bf956/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java index 4f90bf5..53cbb11 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java @@ -317,7 +317,7 @@ public class NodeManager extends CompositeService protected final ConcurrentMap<ApplicationId, Application> applications = new ConcurrentHashMap<ApplicationId, Application>(); - private Map<ApplicationId, Credentials> systemCredentials = + private volatile Map<ApplicationId, Credentials> systemCredentials = new HashMap<ApplicationId, Credentials>(); protected final ConcurrentMap<ContainerId, Container> containers = http://git-wip-us.apache.org/repos/asf/hadoop/blob/be7bf956/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java index fcdd2c1..f561dbb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java @@ -552,7 +552,10 @@ public class NodeStatusUpdaterImpl extends AbstractService implements map.put(entry.getKey(), credentials); } if (LOG.isDebugEnabled()) { - LOG.debug("Retrieved credentials form RM: " + map); + for (Map.Entry<ApplicationId, Credentials> entry : map.entrySet()) { + LOG.debug("Retrieved credentials form RM for " + entry.getKey() + ": " + + entry.getValue().getAllTokens()); + } } return map; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/be7bf956/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java index cb56d67..f4b6221 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java @@ -1122,9 +1122,9 @@ public class ResourceLocalizationService extends CompositeService if (systemCredentials == null) { return null; } - for (Token<?> token : systemCredentials.getAllTokens()) { - LOG.info("Adding new framework-token for " + appId - + " for localization: " + token); + if (LOG.isDebugEnabled()) { + LOG.debug("Adding new framework-token for " + appId + + " for localization: " + systemCredentials.getAllTokens()); } return systemCredentials; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/be7bf956/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java index 3174c5c..20887b6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java @@ -202,9 +202,10 @@ public class AppLogAggregatorImpl implements AppLogAggregator { Credentials systemCredentials = context.getSystemCredentialsForApps().get(appId); if (systemCredentials != null) { - for (Token<?> token : systemCredentials.getAllTokens()) { - LOG.info("Adding new framework-token for " + appId - + " for log-aggregation: " + token + " user=" + userUgi); + if (LOG.isDebugEnabled()) { + LOG.debug("Adding new framework-token for " + appId + + " for log-aggregation: " + systemCredentials.getAllTokens() + + "; userUgi=" + userUgi); } // this will replace old token userUgi.addCredentials(systemCredentials);
