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

HDFS-15146. TestBalancerRPCDelay.testBalancerRPCDelay fails

Browse Source 
intermittently. Contributed by Ahmed Hussein.

(cherry picked from commit 799d4c1cf4e8fe78eb9ab607a0449cdd075041fb)
This commit is contained in:
Kihwal Lee 2020-01-29 11:01:12 -06:00
parent 351c64f327
commit 7034482222
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java
View File

@ -870,6 +870,7 @@ private void doTest(Configuration conf, long[] capacities,
cluster.startDataNodes(conf, 1, true, null, cluster.startDataNodes(conf, 1, true, null,
new String[]{newRack}, null,new long[]{newCapacity}); new String[]{newRack}, null,new long[]{newCapacity});
totalCapacity += newCapacity; totalCapacity += newCapacity;
cluster.triggerHeartbeats();
} else { } else {
//if running a test with "include list", include original nodes as well //if running a test with "include list", include original nodes as well
if (nodes.getNumberofIncludeNodes()>0) { if (nodes.getNumberofIncludeNodes()>0) {
@ -886,11 +887,13 @@ private void doTest(Configuration conf, long[] capacities,
if (nodes.getNames() != null) { if (nodes.getNames() != null) {
cluster.startDataNodes(conf, nodes.getNumberofNewNodes(), true, null, cluster.startDataNodes(conf, nodes.getNumberofNewNodes(), true, null,
newRacks, nodes.getNames(), newCapacities); newRacks, nodes.getNames(), newCapacities);
totalCapacity += newCapacity*nodes.getNumberofNewNodes(); cluster.triggerHeartbeats();
totalCapacity += newCapacity * nodes.getNumberofNewNodes();
} else { // host names are not specified } else { // host names are not specified
cluster.startDataNodes(conf, nodes.getNumberofNewNodes(), true, null, cluster.startDataNodes(conf, nodes.getNumberofNewNodes(), true, null,
newRacks, null, newCapacities); newRacks, null, newCapacities);
totalCapacity += newCapacity*nodes.getNumberofNewNodes(); cluster.triggerHeartbeats();
totalCapacity += newCapacity * nodes.getNumberofNewNodes();
//populate the include nodes //populate the include nodes
if (nodes.getNumberofIncludeNodes() > 0) { if (nodes.getNumberofIncludeNodes() > 0) {
int totalNodes = cluster.getDataNodes().size(); int totalNodes = cluster.getDataNodes().size();
@ -1905,6 +1908,7 @@ public void testManyBalancerSimultaneously() throws Exception {
// start up an empty node with the same capacity and on the same rack // start up an empty node with the same capacity and on the same rack
cluster.startDataNodes(conf, 1, true, null, new String[] { newRack }, cluster.startDataNodes(conf, 1, true, null, new String[] { newRack },
new long[] { newCapacity }); new long[] { newCapacity });
cluster.triggerHeartbeats();
// Case1: Simulate first balancer by creating 'balancer.id' file. It // Case1: Simulate first balancer by creating 'balancer.id' file. It
// will keep this file until the balancing operation is completed. // will keep this file until the balancing operation is completed.