You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2022/06/09 02:17:06 UTC
[hadoop] branch branch-3.3 updated: HDFS-16624. Fix flaky unit test TestDFSAdmin#testAllDatanodesReconfig (#4412)
This is an automated email from the ASF dual-hosted git repository.
tomscut pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new a2f8a9e5d87 HDFS-16624. Fix flaky unit test TestDFSAdmin#testAllDatanodesReconfig (#4412)
a2f8a9e5d87 is described below
commit a2f8a9e5d8772919391f3e51909d2ea2f26165b7
Author: slfan1989 <55...@users.noreply.github.com>
AuthorDate: Wed Jun 8 18:34:25 2022 -0700
HDFS-16624. Fix flaky unit test TestDFSAdmin#testAllDatanodesReconfig (#4412)
Reviewed-by: Viraj Jasani <vj...@apache.org>
Signed-off-by: Tao Li <to...@apache.org>
---
.../src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
index 525503b621c..2f4e27b6902 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
@@ -1098,9 +1098,10 @@ public class TestDFSAdmin {
LOG.info("dfsadmin -status -livenodes output:");
outs.forEach(s -> LOG.info("{}", s));
assertTrue(outs.get(0).startsWith("Reconfiguring status for node"));
- assertEquals("SUCCESS: Changed property dfs.datanode.peer.stats.enabled", outs.get(2));
- assertEquals("\tFrom: \"false\"", outs.get(3));
- assertEquals("\tTo: \"true\"", outs.get(4));
+ assertTrue("SUCCESS: Changed property dfs.datanode.peer.stats.enabled".equals(outs.get(2))
+ || "SUCCESS: Changed property dfs.datanode.peer.stats.enabled".equals(outs.get(1)));
+ assertTrue("\tFrom: \"false\"".equals(outs.get(3)) || "\tFrom: \"false\"".equals(outs.get(2)));
+ assertTrue("\tTo: \"true\"".equals(outs.get(4)) || "\tTo: \"true\"".equals(outs.get(3)));
assertEquals("SUCCESS: Changed property dfs.datanode.peer.stats.enabled", outs.get(5));
assertEquals("\tFrom: \"false\"", outs.get(6));
assertEquals("\tTo: \"true\"", outs.get(7));
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org