Repository: hadoop Updated Branches: refs/heads/branch-2.8 305a9d886 -> ab511286f
HADOOP-14369. NetworkTopology calls expensive toString() when logging. Contributed by Inigo Goiri. (cherry picked from commit dcc292d7ded200a4976f6d348952ecba10f01db2) (cherry picked from commit 484bab39442939e1fe8424def25d1aa4ca99a2e5) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ab511286 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ab511286 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ab511286 Branch: refs/heads/branch-2.8 Commit: ab511286fd2b4cd38303c7face67decb942243c4 Parents: 305a9d8 Author: Andrew Wang <[email protected]> Authored: Tue May 2 10:51:20 2017 -0700 Committer: Andrew Wang <[email protected]> Committed: Tue May 2 10:53:59 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/net/NetworkTopology.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ab511286/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java index fde087b..ca6a53f 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java @@ -409,8 +409,8 @@ public class NetworkTopology { "Not allow to add an inner node: "+NodeBase.getPath(node)); } if ((depthOfAllLeaves != -1) && (depthOfAllLeaves != newDepth)) { - LOG.error("Error: can't add leaf node " + NodeBase.getPath(node) + - " at depth " + newDepth + " to topology:\n" + this.toString()); + LOG.error("Error: can't add leaf node {} at depth {} to topology:{}\n", + NodeBase.getPath(node), newDepth, this); throw new InvalidTopologyException("Failed to add " + NodeBase.getPath(node) + ": You cannot have a rack and a non-rack node at the same " + "level of the network topology."); @@ -432,7 +432,7 @@ public class NetworkTopology { } } } - LOG.debug("NetworkTopology became:\n{}", this.toString()); + LOG.debug("NetworkTopology became:\n{}", this); } finally { netlock.writeLock().unlock(); } @@ -505,7 +505,7 @@ public class NetworkTopology { numOfRacks--; } } - LOG.debug("NetworkTopology became:\n{}", this.toString()); + LOG.debug("NetworkTopology became:\n{}", this); } finally { netlock.writeLock().unlock(); } @@ -764,7 +764,7 @@ public class NetworkTopology { } if (numOfDatanodes == 0) { LOG.debug("Failed to find datanode (scope=\"{}\" excludedScope=\"{}\").", - String.valueOf(scope), String.valueOf(excludedScope)); + scope, excludedScope); return null; } Node ret = null; @@ -777,7 +777,7 @@ public class NetworkTopology { } LOG.debug("Choosing random from {} available nodes on node {}," + " scope={}, excludedScope={}, excludeNodes={}", availableNodes, - innerNode.toString(), scope, excludedScope, excludedNodes); + innerNode, scope, excludedScope, excludedNodes); if (availableNodes > 0) { do { int leaveIndex = r.nextInt(numOfDatanodes); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
