hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-12685 TestSplitLogManager#testLogFilesAreArchived sometimes times out due to race condition
Date Mon, 15 Dec 2014 19:51:04 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 ee4d9b531 -> 8b85feceb


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/8b85fece
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8b85fece
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8b85fece

Branch: refs/heads/branch-1
Commit: 8b85feceb78e4801ace063c18b40cc5ec309e339
Parents: ee4d9b5
Author: tedyu <yuzhihong@gmail.com>
Authored: Mon Dec 15 11:50:54 2014 -0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Mon Dec 15 11:50:54 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/8b85fece/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 e5781fe..f6a7953 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
@@ -590,12 +590,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;
           }
         }
       };


Mime
View raw message