You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zh...@apache.org on 2016/10/31 23:37:53 UTC
[1/2] hadoop git commit: Revert "HDFS-10722. Fix race condition in
TestEditLog#testBatchedSyncWithClosedLogs. Contributed by Daryn Sharp."
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 <zh...@apache.org>
Authored: Mon Oct 31 16:35:05 2016 -0700
Committer: Zhe Zhang <zh...@apache.org>
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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/2] hadoop git commit: Addendum of HDFS-10722 to include HDFS-7964
logic.
Posted by zh...@apache.org.
Addendum of HDFS-10722 to include HDFS-7964 logic.
(cherry picked from commit 4a8e6dc02fb1d0dc89c3981b444575494511444a)
(cherry picked from commit 3b2554f3b0f686a66e3df20b7c381babb9bc74d3)
(cherry picked from commit c2bb9bf00c4a32644f96c673078a812087ef3c46)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/91640a01
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/91640a01
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/91640a01
Branch: refs/heads/branch-2.8
Commit: 91640a01704b01b32b02d3b8408c56df76cdd805
Parents: 7900b1e
Author: Kihwal Lee <ki...@apache.org>
Authored: Thu Aug 4 11:55:31 2016 -0500
Committer: Zhe Zhang <zh...@apache.org>
Committed: Mon Oct 31 16:37:00 2016 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/server/namenode/TestEditLog.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/91640a01/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 140c9c1..3002c8c 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,8 +591,12 @@ public class TestEditLog {
// Log an edit from thread A
doLogEdit(threadA, editLog, "thread-a 1");
- assertEquals("logging edit without syncing should do not affect txid",
- 1, editLog.getSyncTxId());
+ // 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());
+ }
// logSyncAll in Thread B
doCallLogSyncAll(threadB, editLog);
assertEquals("logSyncAll should sync thread A's transaction",
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org