Skip to content

Commit 2ac01b2

Browse files
authored
HDFS-16624. Fix flaky unit test TestDFSAdmin#testAllDatanodesReconfig (#4412)
Reviewed-by: Viraj Jasani <vjasani@apache.org> Signed-off-by: Tao Li <tomscut@apache.org>
1 parent 98ca6fa commit 2ac01b2

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

  • hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,9 +1205,10 @@ public void testAllDatanodesReconfig()
12051205
LOG.info("dfsadmin -status -livenodes output:");
12061206
outs.forEach(s -> LOG.info("{}", s));
12071207
assertTrue(outs.get(0).startsWith("Reconfiguring status for node"));
1208-
assertEquals("SUCCESS: Changed property dfs.datanode.peer.stats.enabled", outs.get(2));
1209-
assertEquals("\tFrom: \"false\"", outs.get(3));
1210-
assertEquals("\tTo: \"true\"", outs.get(4));
1208+
assertTrue("SUCCESS: Changed property dfs.datanode.peer.stats.enabled".equals(outs.get(2))
1209+
|| "SUCCESS: Changed property dfs.datanode.peer.stats.enabled".equals(outs.get(1)));
1210+
assertTrue("\tFrom: \"false\"".equals(outs.get(3)) || "\tFrom: \"false\"".equals(outs.get(2)));
1211+
assertTrue("\tTo: \"true\"".equals(outs.get(4)) || "\tTo: \"true\"".equals(outs.get(3)));
12111212
assertEquals("SUCCESS: Changed property dfs.datanode.peer.stats.enabled", outs.get(5));
12121213
assertEquals("\tFrom: \"false\"", outs.get(6));
12131214
assertEquals("\tTo: \"true\"", outs.get(7));

0 commit comments

Comments
 (0)