Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-14369. NetworkTopology calls expensive toString() when logging. Contributed by Inigo Goiri.

Browse Source 
(cherry picked from commit dcc292d7ded200a4976f6d348952ecba10f01db2)
(cherry picked from commit 484bab39442939e1fe8424def25d1aa4ca99a2e5)
This commit is contained in:
Andrew Wang 2017-05-02 10:51:20 -07:00
parent 305a9d886a
commit ab511286fd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
View File

@ -409,8 +409,8 @@ public void add(Node node) {
"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 void add(Node node) {
}
}
}
LOG.debug("NetworkTopology became:\n{}", this.toString());
LOG.debug("NetworkTopology became:\n{}", this);
} finally {
netlock.writeLock().unlock();
}
@ -505,7 +505,7 @@ public void remove(Node node) {
numOfRacks--;
}
}
LOG.debug("NetworkTopology became:\n{}", this.toString());
LOG.debug("NetworkTopology became:\n{}", this);
} finally {
netlock.writeLock().unlock();
}
@ -764,7 +764,7 @@ private Node chooseRandom(final String scope, String excludedScope,
}
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 @@ private Node chooseRandom(final String scope, String excludedScope,
}
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);