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

This reverts commit 3b79e0f794657a77550318c83d3d7303d745740b.

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,