Forráskód Böngészése

Revert "HDFS-10722. Fix race condition in TestEditLog#testBatchedSyncWithClosedLogs. Contributed by Daryn Sharp."

This reverts commit c2bb9bf00c4a32644f96c673078a812087ef3c46.
Zhe Zhang 8 éve
szülő
commit
7900b1e803

+ 2 - 6
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java

@@ -591,12 +591,8 @@ public class TestEditLog {
 
       // Log an edit from thread A
       doLogEdit(threadA, editLog, "thread-a 1");
-      // async log is doing batched syncs in background.  logSync just ensures
-      // the edit is durable, so the txid may increase prior to sync
-      if (!useAsyncEditLog) {
-        assertEquals("logging edit without syncing should do not affect txid",
-            1, editLog.getSyncTxId());
-      }
+      assertEquals("logging edit without syncing should do not affect txid",
+          1, editLog.getSyncTxId());
       // logSyncAll in Thread B
       doCallLogSyncAll(threadB, editLog);
       assertEquals("logSyncAll should sync thread A's transaction",