[23/50] [abbrv] hbase git commit: HBASE-17816 HRegion#mutateRowWithLocks should update writeRequestCount metric (Weizhan Zeng)

2017-04-17 Thread syuanjiang 
HBASE-17816 HRegion#mutateRowWithLocks should update writeRequestCount metric 
(Weizhan Zeng)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/48b2502a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/48b2502a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/48b2502a

Branch: refs/heads/hbase-12439
Commit: 48b2502a5fcd4d3cd954c3abf6703422da7cdc2f
Parents: af604f0
Author: Jerry He 
Authored: Thu Apr 6 16:45:45 2017 -0700
Committer: Jerry He 
Committed: Thu Apr 6 16:45:45 2017 -0700

--
 .../hadoop/hbase/regionserver/HRegion.java  |  1 +
 .../hadoop/hbase/regionserver/TestHRegion.java  | 24 
 2 files changed, 25 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/48b2502a/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 7f889ce..a87b679 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
@@ -6966,6 +6966,7 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver, Regi
   @Override
   public void mutateRowsWithLocks(Collection mutations,
   Collection rowsToLock, long nonceGroup, long nonce) throws 
IOException {
+writeRequestsCount.add(mutations.size());
 MultiRowMutationProcessor proc = new MultiRowMutationProcessor(mutations, 
rowsToLock);
 processRowsWithLocks(proc, -1, nonceGroup, nonce);
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/48b2502a/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 eac3c77..d56d6ec 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
@@ -6391,4 +6391,28 @@ public class TestHRegion {
   this.region = null;
 }
   }
+
+  @Test
+  public void testMutateRow_WriteRequestCount() throws Exception {
+byte[] row1 = Bytes.toBytes("row1");
+byte[] fam1 = Bytes.toBytes("fam1");
+byte[] qf1 = Bytes.toBytes("qualifier");
+byte[] val1 = Bytes.toBytes("value1");
+
+RowMutations rm = new RowMutations(row1);
+Put put = new Put(row1);
+put.addColumn(fam1, qf1, val1);
+rm.add(put);
+
+this.region = initHRegion(tableName, method, CONF, fam1);
+try {
+  long wrcBeforeMutate = this.region.writeRequestsCount.longValue();
+  this.region.mutateRow(rm);
+  long wrcAfterMutate = this.region.writeRequestsCount.longValue();
+  Assert.assertEquals(wrcBeforeMutate + rm.getMutations().size(), 
wrcAfterMutate);
+} finally {
+  HBaseTestingUtility.closeRegionAndWAL(this.region);
+  this.region = null;
+}
+  }
 }

hbase git commit: HBASE-17816 HRegion#mutateRowWithLocks should update writeRequestCount metric

2017-04-11 Thread jerryjch 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 4030facc9 -> 1afb86a1c


HBASE-17816 HRegion#mutateRowWithLocks should update writeRequestCount metric

Signed-off-by: Jerry He 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1afb86a1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1afb86a1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1afb86a1

Branch: refs/heads/branch-1
Commit: 1afb86a1c1568d77448c22651bf0027a4ede
Parents: 4030fac
Author: qgxiaozhan 
Authored: Tue Apr 11 12:29:27 2017 +0800
Committer: Jerry He 
Committed: Tue Apr 11 18:08:06 2017 -0700

--
 .../hadoop/hbase/regionserver/HRegion.java  |  1 +
 .../hadoop/hbase/regionserver/TestHRegion.java  | 24 
 2 files changed, 25 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/1afb86a1/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 c75dda1..81547d5 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
@@ -7277,6 +7277,7 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver, Regi
   @Override
   public void mutateRowsWithLocks(Collection mutations,
   Collection rowsToLock, long nonceGroup, long nonce) throws 
IOException {
+writeRequestsCount.add(mutations.size());
 MultiRowMutationProcessor proc = new MultiRowMutationProcessor(mutations, 
rowsToLock);
 processRowsWithLocks(proc, -1, nonceGroup, nonce);
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/1afb86a1/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 e1af83a..0b7e3b5 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
@@ -6779,4 +6779,28 @@ public class TestHRegion {
   this.region = null;
 }
   }
+
+  @Test
+  public void testMutateRow_WriteRequestCount() throws Exception {
+byte[] row1 = Bytes.toBytes("row1");
+byte[] fam1 = Bytes.toBytes("fam1");
+byte[] qf1 = Bytes.toBytes("qualifier");
+byte[] val1 = Bytes.toBytes("value1");
+
+RowMutations rm = new RowMutations(row1);
+Put put = new Put(row1);
+put.addColumn(fam1, qf1, val1);
+rm.add(put);
+
+this.region = initHRegion(tableName, method, CONF, fam1);
+try {
+  long wrcBeforeMutate = this.region.writeRequestsCount.get();
+  this.region.mutateRow(rm);
+  long wrcAfterMutate = this.region.writeRequestsCount.get();
+  Assert.assertEquals(wrcBeforeMutate + rm.getMutations().size(), 
wrcAfterMutate);
+} finally {
+  HBaseTestingUtility.closeRegionAndWAL(this.region);
+  this.region = null;
+}
+  }
 }

[14/54] [abbrv] hbase git commit: HBASE-17816 HRegion#mutateRowWithLocks should update writeRequestCount metric (Weizhan Zeng)

2017-04-11 Thread elserj 
HBASE-17816 HRegion#mutateRowWithLocks should update writeRequestCount metric 
(Weizhan Zeng)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/48b2502a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/48b2502a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/48b2502a

Branch: refs/heads/HBASE-16961
Commit: 48b2502a5fcd4d3cd954c3abf6703422da7cdc2f
Parents: af604f0
Author: Jerry He 
Authored: Thu Apr 6 16:45:45 2017 -0700
Committer: Jerry He 
Committed: Thu Apr 6 16:45:45 2017 -0700

--
 .../hadoop/hbase/regionserver/HRegion.java  |  1 +
 .../hadoop/hbase/regionserver/TestHRegion.java  | 24 
 2 files changed, 25 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/48b2502a/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 7f889ce..a87b679 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
@@ -6966,6 +6966,7 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver, Regi
   @Override
   public void mutateRowsWithLocks(Collection mutations,
   Collection rowsToLock, long nonceGroup, long nonce) throws 
IOException {
+writeRequestsCount.add(mutations.size());
 MultiRowMutationProcessor proc = new MultiRowMutationProcessor(mutations, 
rowsToLock);
 processRowsWithLocks(proc, -1, nonceGroup, nonce);
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/48b2502a/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 eac3c77..d56d6ec 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
@@ -6391,4 +6391,28 @@ public class TestHRegion {
   this.region = null;
 }
   }
+
+  @Test
+  public void testMutateRow_WriteRequestCount() throws Exception {
+byte[] row1 = Bytes.toBytes("row1");
+byte[] fam1 = Bytes.toBytes("fam1");
+byte[] qf1 = Bytes.toBytes("qualifier");
+byte[] val1 = Bytes.toBytes("value1");
+
+RowMutations rm = new RowMutations(row1);
+Put put = new Put(row1);
+put.addColumn(fam1, qf1, val1);
+rm.add(put);
+
+this.region = initHRegion(tableName, method, CONF, fam1);
+try {
+  long wrcBeforeMutate = this.region.writeRequestsCount.longValue();
+  this.region.mutateRow(rm);
+  long wrcAfterMutate = this.region.writeRequestsCount.longValue();
+  Assert.assertEquals(wrcBeforeMutate + rm.getMutations().size(), 
wrcAfterMutate);
+} finally {
+  HBaseTestingUtility.closeRegionAndWAL(this.region);
+  this.region = null;
+}
+  }
 }