You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2014/09/01 23:28:48 UTC

git commit: HBASE-11867 TestSplitLogManager.testUnassignedTimeout is flaky

Repository: hbase
Updated Branches:
  refs/heads/master 125f5619b -> d16c9d377


HBASE-11867 TestSplitLogManager.testUnassignedTimeout is flaky


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d16c9d37
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d16c9d37
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d16c9d37

Branch: refs/heads/master
Commit: d16c9d37762014270b4f7e0b3b0c721f82e3bfb5
Parents: 125f561
Author: Jimmy Xiang <jx...@cloudera.com>
Authored: Mon Sep 1 14:27:06 2014 -0700
Committer: Jimmy Xiang <jx...@cloudera.com>
Committed: Mon Sep 1 14:28:01 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/master/TestSplitLogManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d16c9d37/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 125cacd..2aa4434 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
@@ -206,7 +206,7 @@ public class TestSplitLogManager {
     conf.setInt("hbase.splitlog.manager.unassigned.timeout", 2 * to);
 
     conf.setInt("hbase.splitlog.manager.timeoutmonitor.period", 100);
-    to = to + 4 * 100;
+    to = to + 16 * 100;
 
     this.mode =
         (conf.getBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, false) ? RecoveryMode.LOG_REPLAY
@@ -455,7 +455,7 @@ public class TestSplitLogManager {
     SplitLogTask slt = new SplitLogTask.Resigned(worker1, this.mode);
     assertEquals(tot_mgr_resubmit.get(), 0);
     ZKUtil.setData(zkw, tasknode, slt.toByteArray());
-    int version = ZKUtil.checkExists(zkw, tasknode);
+    ZKUtil.checkExists(zkw, tasknode);
     // Could be small race here.
     if (tot_mgr_resubmit.get() == 0) {
       waitForCounter(tot_mgr_resubmit, 0, 1, to/2);