You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2015/11/25 05:33:01 UTC
[4/6] hbase git commit: HBASE-14689 Addendum and unit test for
HBASE-13471
HBASE-14689 Addendum and unit test for HBASE-13471
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f28cd4aa
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f28cd4aa
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f28cd4aa
Branch: refs/heads/branch-1.1
Commit: f28cd4aa23196cd5466af84285db813beee0ec33
Parents: a75d2aa
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Nov 24 19:15:09 2015 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Nov 24 19:37:50 2015 -0800
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/HRegion.java | 1 -
.../hadoop/hbase/regionserver/TestHRegion.java | 69 ++++++++++++++++++++
2 files changed, 69 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f28cd4aa/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 11c8945..d12ac32 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -2985,7 +2985,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
if (rowLock == null) {
// We failed to grab another lock
- assert !shouldBlock : "Should never fail to get lock when blocking";
break; // stop acquiring more rows for this batch
} else {
acquiredRowLocks.add(rowLock);
http://git-wip-us.apache.org/repos/asf/hbase/blob/f28cd4aa/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 5add20e..a4fe735 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -56,6 +56,12 @@ import java.util.Map;
import java.util.NavigableMap;
import java.util.TreeMap;
import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@@ -100,6 +106,7 @@ import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Increment;
+import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.RowMutations;
@@ -6339,6 +6346,68 @@ public class TestHRegion {
qual2, 0, qual2.length));
}
+ @Test(timeout = 60000)
+ public void testBatchMutateWithWrongRegionException() throws Exception {
+ final byte[] a = Bytes.toBytes("a");
+ final byte[] b = Bytes.toBytes("b");
+ final byte[] c = Bytes.toBytes("c"); // exclusive
+
+ int prevLockTimeout = CONF.getInt("hbase.rowlock.wait.duration", 30000);
+ CONF.setInt("hbase.rowlock.wait.duration", 1000);
+ final HRegion region = initHRegion(tableName, a, c, name.getMethodName(), CONF, false, fam1);
+
+ Mutation[] mutations = new Mutation[] {
+ new Put(a).addImmutable(fam1, null, null),
+ new Put(c).addImmutable(fam1, null, null), // this is outside the region boundary
+ new Put(b).addImmutable(fam1, null, null),
+ };
+
+ OperationStatus[] status = region.batchMutate(mutations);
+ assertEquals(status[0].getOperationStatusCode(), OperationStatusCode.SUCCESS);
+ assertEquals(status[1].getOperationStatusCode(), OperationStatusCode.SANITY_CHECK_FAILURE);
+ assertEquals(status[2].getOperationStatusCode(), OperationStatusCode.SUCCESS);
+
+
+ // test with a row lock held for a long time
+ final CountDownLatch obtainedRowLock = new CountDownLatch(1);
+ ExecutorService exec = Executors.newFixedThreadPool(2);
+ Future<Void> f1 = exec.submit(new Callable<Void>() {
+ @Override
+ public Void call() throws Exception {
+ LOG.info("Acquiring row lock");
+ RowLock rl = region.getRowLock(b);
+ obtainedRowLock.countDown();
+ LOG.info("Waiting for 5 seconds before releasing lock");
+ Threads.sleep(5000);
+ LOG.info("Releasing row lock");
+ rl.release();
+ return null;
+ }
+ });
+ obtainedRowLock.await(30, TimeUnit.SECONDS);
+
+ Future<Void> f2 = exec.submit(new Callable<Void>() {
+ @Override
+ public Void call() throws Exception {
+ Mutation[] mutations = new Mutation[] {
+ new Put(a).addImmutable(fam1, null, null),
+ new Put(b).addImmutable(fam1, null, null),
+ };
+
+ // this will wait for the row lock, and it will eventually succeed
+ OperationStatus[] status = region.batchMutate(mutations);
+ assertEquals(status[0].getOperationStatusCode(), OperationStatusCode.SUCCESS);
+ assertEquals(status[1].getOperationStatusCode(), OperationStatusCode.SUCCESS);
+ return null;
+ }
+ });
+
+ f1.get();
+ f2.get();
+
+ CONF.setInt("hbase.rowlock.wait.duration", prevLockTimeout);
+ }
+
@Test
public void testCheckAndRowMutateTimestampsAreMonotonic() throws IOException {
HRegion region = initHRegion(tableName, name.getMethodName(), CONF, fam1);