From 6a28496fb0fa126badd3da92e7d5f9b57eb8a48a Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Thu, 25 Nov 2021 22:18:32 +0900
Subject: [PATCH] Revert "HDFS-16336. Addendum: De-flake
 TestRollingUpgrade#testRollback (#3686). Contributed by Viraj Jasani.."

This reverts commit 4231067d0b1932f891410f7b461b986848b855d3.
---
 .../test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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
index 3abd00b79b7..106def8d1a5 100644
--- 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 @@ public class TestRollingUpgrade {
         LOG.error("Something went wrong.", t);
         return false;
       }
-    }, 100, 8000);
+    }, 100, 8000, "RollingUpgradeStatus is already set");
   }
 
   private static void startRollingUpgrade(Path foo, Path bar,