Fix unit tests

Author: aswinmprabhu

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeSync.java

@@ -480,7 +480,7 @@ public void testSyncDuringRollingUpgrade() throws Exception {
     }
   }
 
-  @Test(timeout=900_000)
+  @Test(timeout=300_000)
   public void testFormatWithSyncer() throws Exception {
     File firstJournalDir = jCluster.getJournalDir(0, jid);
     File firstJournalCurrentDir = new StorageDirectory(firstJournalDir)
@@ -493,17 +493,18 @@ public void testFormatWithSyncer() throws Exception {
     List<File> missingLogs = Lists.newArrayList();
     missingLogs.add(deleteEditLog(firstJournalCurrentDir, firstTxId));
 
-    // Delete the storage directory itself to simulate a disk wipe
+    // Wait to ensure sync starts, delete the storage directory itself to simulate a disk wipe
     // and ensure that the in-memory formatting state of JNStorage gets updated
+    Thread.sleep(2000);
     FileUtils.deleteDirectory(firstJournalDir);
     jCluster.getJournalNode(0).getOrCreateJournal(jid).getStorage().analyzeStorage();
 
     // Wait for JN formatting with Syncer
-    GenericTestUtils.waitFor(jnFormatted(0), 500, 90000);
+    GenericTestUtils.waitFor(jnFormatted(0), 500, 30000);
     // Generate some more edit log so that the JN updates its committed tx id
     generateEditLog();
     // Check that the missing edit logs have been synced
-    GenericTestUtils.waitFor(editLogExists(missingLogs), 500, 90000);
+    GenericTestUtils.waitFor(editLogExists(missingLogs), 500, 30000);
   }
 
   private File deleteEditLog(File currentDir, long startTxId)