Repository: hadoop Updated Branches: refs/heads/branch-2.8 c2bb9bf00 -> 91640a017
Revert "HDFS-10722. Fix race condition in TestEditLog#testBatchedSyncWithClosedLogs. Contributed by Daryn Sharp." This reverts commit c2bb9bf00c4a32644f96c673078a812087ef3c46. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7900b1e8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7900b1e8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7900b1e8 Branch: refs/heads/branch-2.8 Commit: 7900b1e803e5bdbdb27165bb2bdad928a1876131 Parents: c2bb9bf Author: Zhe Zhang <[email protected]> Authored: Mon Oct 31 16:35:05 2016 -0700 Committer: Zhe Zhang <[email protected]> Committed: Mon Oct 31 16:35:05 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/namenode/TestEditLog.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7900b1e8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java index 3002c8c..140c9c1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java +++ b/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", --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
