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-13854 TestTableLockManager#testLockTimeoutException fails in 0.98 and 1.0 branches
Date Mon, 08 Jun 2015 13:07:38 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 375a75163 -> 7b3a9ed2e


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

Branch: refs/heads/branch-1.0
Commit: 7b3a9ed2ebdabf00219093ed0896c256566af684
Parents: 375a751
Author: tedyu <yuzhihong@gmail.com>
Authored: Mon Jun 8 06:07:17 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Mon Jun 8 06:07:17 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/7b3a9ed2/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 2aba875..511f2e1 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 {


Mime
View raw message