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 2015/06/08 15:04:21 UTC
hbase git commit: HBASE-13854
TestTableLockManager#testLockTimeoutException fails in 0.98 and 1.0 branches
Repository: hbase
Updated Branches:
refs/heads/0.98 a86675c2f -> b147630f1
HBASE-13854 TestTableLockManager#testLockTimeoutException fails in 0.98 and 1.0 branches
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b147630f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b147630f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b147630f
Branch: refs/heads/0.98
Commit: b147630f15f12f8393650b17aadf1a1d3db7a234
Parents: a86675c
Author: tedyu <yu...@gmail.com>
Authored: Mon Jun 8 06:04:15 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Mon Jun 8 06:04:15 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/master/TestTableLockManager.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b147630f/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java
index ee84674..1d78b2b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java
@@ -76,7 +76,8 @@ public class TestTableLockManager {
private static final TableName TABLE_NAME =
TableName.valueOf("TestTableLevelLocks");
- private static final byte[] FAMILY = Bytes.toBytes("f1");
+ private static final String FAMILY1 = "f1";
+ private static final byte[] FAMILY = Bytes.toBytes(FAMILY1);
private static final byte[] NEW_FAMILY = Bytes.toBytes("f2");
@@ -89,7 +90,7 @@ public class TestTableLockManager {
public void prepareMiniCluster() throws Exception {
TEST_UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true);
TEST_UTIL.startMiniCluster(2);
- TEST_UTIL.createTable(TABLE_NAME, FAMILY);
+ TEST_UTIL.createTable(TABLE_NAME, new String[] { FAMILY1, "f3" });
}
public void prepareMiniZkCluster() throws Exception {