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

This reverts commit 4231067d0b1932f891410f7b461b986848b855d3.

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,