You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2014/12/04 07:35:24 UTC
[1/2] hbase git commit: Add timeout on
TestDefaultLoadBalancer#testBalancerCluster to see if we can stop it hanging
as a zombie in precommit builds
Repository: hbase
Updated Branches:
refs/heads/branch-1 806716e65 -> bb07de196
Add timeout on TestDefaultLoadBalancer#testBalancerCluster to see if we can stop it hanging as a zombie in precommit builds
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fe9e7483
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fe9e7483
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fe9e7483
Branch: refs/heads/branch-1
Commit: fe9e7483a316df9f5a62e9c215bcedcfd65c5f12
Parents: 806716e
Author: stack <st...@apache.org>
Authored: Wed Dec 3 11:12:09 2014 -0800
Committer: stack <st...@apache.org>
Committed: Wed Dec 3 22:35:02 2014 -0800
----------------------------------------------------------------------
.../hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/fe9e7483/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java
index 2a4278f..2c8fc1e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java
@@ -108,7 +108,7 @@ public class TestDefaultLoadBalancer extends BalancerTestBase {
*
* @throws Exception
*/
- @Test
+ @Test (timeout=60000)
public void testBalanceCluster() throws Exception {
for (int[] mockCluster : clusterStateMocks) {
[2/2] hbase git commit: HBASE-12431 Use of getColumnLatestCell(byte[], int,
int, byte[], int, int) is Not Thread Safe (Jingcheng Du)
Posted by st...@apache.org.
HBASE-12431 Use of getColumnLatestCell(byte[], int, int, byte[], int, int) is Not Thread Safe (Jingcheng Du)
(cherry picked from commit c45772e76a581838ea89ff303d0ff67ceaa82845)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bb07de19
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bb07de19
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bb07de19
Branch: refs/heads/branch-1
Commit: bb07de19606cce699e539d49af3ba1c5a12b75fe
Parents: fe9e748
Author: stack <st...@apache.org>
Authored: Wed Dec 3 22:34:27 2014 -0800
Committer: stack <st...@apache.org>
Committed: Wed Dec 3 22:35:14 2014 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/client/Result.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/bb07de19/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
index 86070de..401710e 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java
@@ -84,8 +84,7 @@ public class Result implements CellScannable, CellScanner {
// Ditto for familyMap. It can be composed on fly from passed in kvs.
private transient NavigableMap<byte[], NavigableMap<byte[], NavigableMap<Long, byte[]>>> familyMap = null;
- // never use directly
- private static byte [] buffer = null;
+ private static ThreadLocal<byte[]> localBuffer = new ThreadLocal<byte[]>();
private static final int PAD_WIDTH = 128;
public static final Result EMPTY_RESULT = new Result();
@@ -334,9 +333,11 @@ public class Result implements CellScannable, CellScanner {
double keyValueSize = (double)
KeyValue.getKeyValueDataStructureSize(kvs[0].getRowLength(), flength, qlength, 0);
+ byte[] buffer = localBuffer.get();
if (buffer == null || keyValueSize > buffer.length) {
// pad to the smallest multiple of the pad width
buffer = new byte[(int) Math.ceil(keyValueSize / PAD_WIDTH) * PAD_WIDTH];
+ localBuffer.set(buffer);
}
Cell searchTerm = KeyValueUtil.createFirstOnRow(buffer, 0,