FAQ
Repository: hbase
Updated Branches:
   refs/heads/0.98 5d2cd28c6 -> 695843bcd


HBASE-15837 Memstore size accounting is wrong if postBatchMutate() throws exception

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

Conflicts:
  hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

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

Branch: refs/heads/0.98
Commit: 695843bcdabcf1030638f2ccc3a522184e162431
Parents: 5d2cd28
Author: Enis Soztutar <enis@apache.org>
Authored: Wed May 25 17:04:50 2016 -0700
Committer: Enis Soztutar <enis@apache.org>
Committed: Thu May 26 13:52:51 2016 -0700

----------------------------------------------------------------------
  .../hadoop/hbase/regionserver/HRegion.java | 18 +++++++--
  .../hadoop/hbase/regionserver/TestHRegion.java | 40 ++++++++++++++++++++
  2 files changed, 54 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/695843bc/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 f426cdd..c337c9c 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
@@ -941,7 +941,15 @@ public class HRegion implements HeapSize { // , Writable{
      if (this.rsAccounting != null) {
        rsAccounting.addAndGetGlobalMemstoreSize(memStoreSize);
      }
- return this.memstoreSize.addAndGet(memStoreSize);
+ long size = this.memstoreSize.addAndGet(memStoreSize);
+ // This is extremely bad if we make memstoreSize negative. Log as much info on the offending
+ // caller as possible. (memStoreSize might be a negative value already -- freeing memory)
+ if (size < 0) {
+ LOG.error("Asked to modify this region's (" + this.toString()
+ + ") memstoreSize to a negative value which is incorrect. Current memstoreSize="
+ + (size-memStoreSize) + ", delta=" + memStoreSize, new Exception());
+ }
+ return size;
    }

    /** @return a HRegionInfo object for this region */
@@ -2346,8 +2354,8 @@ public class HRegion implements HeapSize { // , Writable{
            }
            initialized = true;
          }
- long addedSize = doMiniBatchMutation(batchOp);
- long newSize = this.addAndGetGlobalMemstoreSize(addedSize);
+ doMiniBatchMutation(batchOp);
+ long newSize = this.getMemstoreSize().get();
          if (isFlushSize(newSize)) {
            requestFlush();
          }
@@ -2426,6 +2434,7 @@ public class HRegion implements HeapSize { // , Writable{
      int lastIndexExclusive = firstIndex;
      boolean success = false;
      int noOfPuts = 0, noOfDeletes = 0;
+ long addedSize = 0;
      try {
        // ------------------------------------
        // STEP 1. Try to acquire as many locks as we can, and ensure
@@ -2578,7 +2587,6 @@ public class HRegion implements HeapSize { // , Writable{
        // visible to scanners till we update the MVCC. The MVCC is
        // moved only when the sync is complete.
        // ----------------------------------
- long addedSize = 0;
        for (int i = firstIndex; i < lastIndexExclusive; i++) {
          if (batchOp.retCodeDetails[i].getOperationStatusCode()
              != OperationStatusCode.NOT_RUN) {
@@ -2712,6 +2720,8 @@ public class HRegion implements HeapSize { // , Writable{
        // if the wal sync was unsuccessful, remove keys from memstore
        if (doRollBackMemstore) {
          rollbackMemstore(batchOp, familyMaps, firstIndex, lastIndexExclusive);
+ } else {
+ this.addAndGetGlobalMemstoreSize(addedSize);
        }
        if (w != null) mvcc.completeMemstoreInsert(w);


http://git-wip-us.apache.org/repos/asf/hbase/blob/695843bc/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 272609d..addad00 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
@@ -37,6 +37,8 @@ import static org.mockito.Matchers.any;
  import static org.mockito.Matchers.anyBoolean;
  import static org.mockito.Matchers.anyLong;
  import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
  import static org.mockito.Mockito.never;
  import static org.mockito.Mockito.spy;
  import static org.mockito.Mockito.times;
@@ -345,6 +347,44 @@ public class TestHRegion {
      HRegion.closeHRegion(region);
    }

+ @Test
+ public void testMemstoreSizeAccountingWithFailedPostBatchMutate() throws IOException {
+ String testName = "testMemstoreSizeAccountingWithFailedPostBatchMutate";
+ FileSystem fs = FileSystem.get(CONF);
+ Path rootDir = new Path(dir + testName);
+ HLog hlog = HLogFactory.createHLog(FILESYSTEM, rootDir, testName, CONF);
+ HRegion region = initHRegion(tableName, null, null, name.getMethodName(),
+ CONF, false, Durability.SYNC_WAL, hlog, COLUMN_FAMILY_BYTES);
+ Store store = region.getStore(COLUMN_FAMILY_BYTES);
+ assertEquals(0, region.getMemstoreSize().get());
+
+ // Put one value
+ byte [] value = Bytes.toBytes(name.getMethodName());
+ Put put = new Put(value);
+ put.add(COLUMN_FAMILY_BYTES, Bytes.toBytes("abc"), value);
+ region.put(put);
+ long onePutSize = region.getMemstoreSize().get();
+ assertTrue(onePutSize > 0);
+
+ RegionCoprocessorHost mockedCPHost = Mockito.mock(RegionCoprocessorHost.class);
+ doThrow(new IOException())
+ .when(mockedCPHost).postBatchMutate(Mockito.<MiniBatchOperationInProgress<Mutation>>any());
+ region.setCoprocessorHost(mockedCPHost);
+
+ put = new Put(value);
+ put.add(COLUMN_FAMILY_BYTES, Bytes.toBytes("dfg"), value);
+ try {
+ region.put(put);
+ fail("Should have failed with IOException");
+ } catch (IOException expected) {
+ }
+ assertEquals("memstoreSize should be incremented", onePutSize * 2, region.getMemstoreSize().get());
+ assertEquals("flushable size should be incremented", onePutSize * 2, store.getFlushableSize());
+
+ region.setCoprocessorHost(null);
+ HRegion.closeHRegion(region);
+ }
+
    /**
     * Test we do not lose data if we fail a flush and then close.
     * Part of HBase-10466. Tests the following from the issue description:

Search Discussions

Discussion Posts

Previous

Related Discussions

Discussion Navigation
viewthread | post
posts ‹ prev | 6 of 6 | next ›
Discussion Overview
groupcommits @
categorieshbase, hadoop
postedMay 26, '16 at 6:19p
activeMay 26, '16 at 8:53p
posts6
users1
websitehbase.apache.org

1 user in discussion

Enis: 6 posts

People

Translate

site design / logo © 2019 Grokbase