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

HDFS-11484. Ozone: Fix flaky TestNodeManager#testScmNodeReportUpdate. Contributed by Xiaoyu Yao.

This commit is contained in:
Anu Engineer 2017-03-02 15:10:47 -08:00 committed by Owen O'Malley
parent a2328d36ac
commit d55564143d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/node/TestNodeManager.java
View File

@ -970,13 +970,14 @@ public class TestNodeManager {
Thread.sleep(100); Thread.sleep(100);
} }
GenericTestUtils.waitFor(() -> nodeManager.waitForHeartbeatThead(), 100,
4 * 1000);
assertEquals(nodeCount, nodeManager.getNodeCount(HEALTHY));
final long expectedScmUsed = usedPerHeartbeat * (heartbeatCount -1); final long expectedScmUsed = usedPerHeartbeat * (heartbeatCount -1);
final long expectedRemaining = capacity - final long expectedRemaining = capacity -
usedPerHeartbeat * (heartbeatCount - 1); usedPerHeartbeat * (heartbeatCount - 1);
GenericTestUtils.waitFor(
() -> nodeManager.getStats().getScmUsed() == expectedScmUsed, 100,
4 * 1000);
assertEquals(capacity, nodeManager.getStats().getCapacity()); assertEquals(capacity, nodeManager.getStats().getCapacity());
assertEquals(expectedScmUsed, nodeManager.getStats().getScmUsed()); assertEquals(expectedScmUsed, nodeManager.getStats().getScmUsed());
assertEquals(expectedRemaining, nodeManager.getStats().getRemaining()); assertEquals(expectedRemaining, nodeManager.getStats().getRemaining());
@ -1001,11 +1002,11 @@ public class TestNodeManager {
assertEquals(expectedRemaining, assertEquals(expectedRemaining,
nodeManager.getNodeStats().get(0).getRemaining()); nodeManager.getNodeStats().get(0).getRemaining());
// Wait up to 3 more seconds so the node becomes dead // Wait up to 4 more seconds so the node becomes dead
// Verify usage info should be updated. // Verify usage info should be updated.
GenericTestUtils.waitFor( GenericTestUtils.waitFor(
() -> nodeManager.getNodeCount(NodeManager.NODESTATE.DEAD) == 1, 100, () -> nodeManager.getNodeCount(NodeManager.NODESTATE.DEAD) == 1, 100,
3 * 1000); 4 * 1000);
assertEquals(0, nodeManager.getNodeStats().size()); assertEquals(0, nodeManager.getNodeStats().size());
assertEquals(0, nodeManager.getStats().getCapacity()); assertEquals(0, nodeManager.getStats().getCapacity());
@ -1026,6 +1027,9 @@ public class TestNodeManager {
GenericTestUtils.waitFor( GenericTestUtils.waitFor(
() -> nodeManager.getNodeCount(NodeManager.NODESTATE.HEALTHY) == 1, () -> nodeManager.getNodeCount(NodeManager.NODESTATE.HEALTHY) == 1,
100, 5 * 1000); 100, 5 * 1000);
GenericTestUtils.waitFor(
() -> nodeManager.getStats().getScmUsed() == expectedScmUsed, 100,
4 * 1000);
assertEquals(nodeCount, nodeManager.getNodeStats().size()); assertEquals(nodeCount, nodeManager.getNodeStats().size());
assertEquals(capacity, nodeManager.getNodeStats().get(0).getCapacity()); assertEquals(capacity, nodeManager.getNodeStats().get(0).getCapacity());
assertEquals(expectedScmUsed, assertEquals(expectedScmUsed,