Repository: hbase Updated Branches: refs/heads/master 5136c7055 -> 0e647de3e
HBASE-11353 Wrong Write Request Count Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0e647de3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0e647de3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0e647de3 Branch: refs/heads/master Commit: 0e647de3ee47477f9a1618cce3b07d18a0da80a8 Parents: 5136c70 Author: Nicolas Liochon <[email protected]> Authored: Mon Jun 16 09:54:15 2014 +0200 Committer: Nicolas Liochon <[email protected]> Committed: Mon Jun 16 09:54:15 2014 +0200 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/HRegion.java | 2 -- .../hadoop/hbase/regionserver/TestHRegion.java | 26 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0e647de3/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 eeecb45..bea8f45 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 @@ -2003,7 +2003,6 @@ public class HRegion implements HeapSize { // , Writable{ checkReadOnly(); checkResources(); startRegionOperation(Operation.DELETE); - this.writeRequestsCount.increment(); try { delete.getRow(); // All edits for the given row (across all column families) must happen atomically. @@ -2110,7 +2109,6 @@ public class HRegion implements HeapSize { // , Writable{ // will be extremely rare; we'll deal with it when it happens. checkResources(); startRegionOperation(Operation.PUT); - this.writeRequestsCount.increment(); try { // All edits for the given row (across all column families) must happen atomically. doBatchMutate(put); http://git-wip-us.apache.org/repos/asf/hbase/blob/0e647de3/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 0f55b62..a053830 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 @@ -4983,6 +4983,32 @@ public class TestHRegion { } } + @Test + public void testWriteRequestsCounter() throws IOException { + byte[] fam = Bytes.toBytes("info"); + byte[][] families = { fam }; + this.region = initHRegion(tableName, method, CONF, families); + + Assert.assertEquals(0L, region.getWriteRequestsCount()); + + Put put = new Put(row); + put.add(fam, fam, fam); + + Assert.assertEquals(0L, region.getWriteRequestsCount()); + region.put(put); + Assert.assertEquals(1L, region.getWriteRequestsCount()); + region.put(put); + Assert.assertEquals(2L, region.getWriteRequestsCount()); + region.put(put); + Assert.assertEquals(3L, region.getWriteRequestsCount()); + + region.delete(new Delete(row)); + Assert.assertEquals(4L, region.getWriteRequestsCount()); + + HRegion.closeHRegion(this.region); + this.region = null; + } + private static HRegion initHRegion(byte[] tableName, String callingMethod, byte[]... families) throws IOException { return initHRegion(tableName, callingMethod, HBaseConfiguration.create(),
