Revert "HDFS-16336. Addendum: De-flake TestRollingUpgrade#testRollback (#3686). Contributed by Viraj Jasani.."

This reverts commit 4231067d0b1932f891410f7b461b986848b855d3.
2021-11-25 22:18:32 +09:00 · 2021-11-25 22:18:32 +09:00 · 6a28496fb0
commit 6a28496fb0
parent 03c908fb04
1 changed files with 1 additions and 1 deletions
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java
@ -366,7 +366,7 @@ private void waitForNullMxBean() throws TimeoutException, InterruptedException {
        LOG.error("Something went wrong.", t);
        return false;
      }
-    }, 100, 8000);
+    }, 100, 8000, "RollingUpgradeStatus is already set");
  }

  private static void startRollingUpgrade(Path foo, Path bar,