You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/12/15 20:49:42 UTC
hbase git commit: HBASE-12685
TestSplitLogManager#testLogFilesAreArchived sometimes times out due to race
condition
Repository: hbase
Updated Branches:
refs/heads/master 2cab24ab9 -> 065d03b78
HBASE-12685 TestSplitLogManager#testLogFilesAreArchived sometimes times out due to race condition
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/065d03b7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/065d03b7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/065d03b7
Branch: refs/heads/master
Commit: 065d03b7840e0091adbb2aa9779b8129ed9883aa
Parents: 2cab24a
Author: tedyu <yu...@gmail.com>
Authored: Mon Dec 15 11:49:39 2014 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Mon Dec 15 11:49:39 2014 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/master/TestSplitLogManager.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/065d03b7/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
index 53de0a4..71f3ed3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
@@ -591,12 +591,16 @@ public class TestSplitLogManager {
for (Map.Entry<String, Task> entry : slm.getTasks().entrySet()) {
final ServerName worker1 = ServerName.valueOf("worker1,1,1");
SplitLogTask slt = new SplitLogTask.Done(worker1, RecoveryMode.LOG_SPLITTING);
+ boolean encounteredZKException = false;
try {
ZKUtil.setData(zkw, entry.getKey(), slt.toByteArray());
} catch (KeeperException e) {
LOG.warn(e);
+ encounteredZKException = true;
+ }
+ if (!encounteredZKException) {
+ done = true;
}
- done = true;
}
}
};