Repository: hadoop Updated Branches: refs/heads/branch-2 06386b7e7 -> 10fd5627b
YARN-6188. Fix OOM issue with decommissioningNodesWatcher in the case of clusters with large number of nodes (Contributed by Ajay Jadhav via Daniel Templeton) (cherry picked from commit 585168cc1bdb87398d4f388f3eeccd1c71114982) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/10fd5627 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/10fd5627 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/10fd5627 Branch: refs/heads/branch-2 Commit: 10fd5627bb53a16d0df30a53801c411d0f3c9823 Parents: 06386b7 Author: Daniel Templeton <templ...@apache.org> Authored: Fri Feb 17 13:11:43 2017 -0800 Committer: Daniel Templeton <templ...@apache.org> Committed: Fri Feb 17 13:14:37 2017 -0800 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/DecommissioningNodesWatcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/10fd5627/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DecommissioningNodesWatcher.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/DecommissioningNodesWatcher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DecommissioningNodesWatcher.java index 376b503..9631803 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DecommissioningNodesWatcher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/DecommissioningNodesWatcher.java @@ -385,9 +385,9 @@ public class DecommissioningNodesWatcher { if (!LOG.isDebugEnabled() || decomNodes.size() == 0) { return; } - StringBuilder sb = new StringBuilder(); long now = mclock.getTime(); for (DecommissioningNodeContext d : decomNodes.values()) { + StringBuilder sb = new StringBuilder(); DecommissioningNodeStatus s = checkDecommissioningStatus(d.nodeId); sb.append(String.format( "%n %-34s %4ds fresh:%3ds containers:%2d %14s", @@ -413,8 +413,8 @@ public class DecommissioningNodesWatcher { (mclock.getTime() - rmApp.getStartTime()) / 1000)); } } + LOG.debug("Decommissioning node: " + sb.toString()); } - LOG.info("Decommissioning Nodes: " + sb.toString()); } // Read possible new DECOMMISSIONING_TIMEOUT_KEY from yarn-site.xml. --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
