[07/18] hbase git commit: HBASE-19927 Addendum join on RegionServerThread instead of HRegionServer

[zhangduo]

HBASE-19927 Addendum join on RegionServerThread instead of HRegionServer


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

Branch: refs/heads/HBASE-19064
Commit: f5197979aaac7e36b6af36b86ea8dc8d7774fabe
Parents: 6d04aa1
Author: zhangduo 
Authored: Tue Feb 6 10:01:23 2018 +0800
Committer: zhangduo 
Committed: Tue Feb 6 10:01:23 2018 +0800

--
 .../java/org/apache/hadoop/hbase/HBaseTestingUtility.java   | 3 +--
 .../org/apache/hadoop/hbase/TestFullLogReconstruction.java  | 9 +
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f5197979/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index ecd2fa5..4f55199 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -2635,11 +2635,10 @@ public class HBaseTestingUtility extends 
HBaseZKTestingUtility {
* Expire a region server's session
* @param index which RS
*/
-  public HRegionServer expireRegionServerSession(int index) throws Exception {
+  public void expireRegionServerSession(int index) throws Exception {
 HRegionServer rs = getMiniHBaseCluster().getRegionServer(index);
 expireSession(rs.getZooKeeper(), false);
 decrementMinRegionServerCount();
-return rs;
   }
 
   private void decrementMinRegionServerCount() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/f5197979/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
index 13c616f..87152fc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
@@ -22,10 +22,10 @@ import static org.junit.Assert.assertEquals;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;
 import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -81,19 +81,20 @@ public class TestFullLogReconstruction {
 for (int i = 0; i < 4; i++) {
   TEST_UTIL.loadTable(table, FAMILY);
 }
-HRegionServer rs = TEST_UTIL.expireRegionServerSession(0);
+RegionServerThread rsThread = 
TEST_UTIL.getHBaseCluster().getRegionServerThreads().get(0);
+TEST_UTIL.expireRegionServerSession(0);
 // make sure that the RS is fully down before reading, so that we will 
read the data from other
 // RSes.
 TEST_UTIL.waitFor(3, new ExplainingPredicate() {
 
   @Override
   public boolean evaluate() throws Exception {
-return !rs.isAlive();
+return !rsThread.isAlive();
   }
 
   @Override
   public String explainFailure() throws Exception {
-return rs + " is still alive";
+return rsThread.getRegionServer() + " is still alive";
   }
 });
 

[08/50] hbase git commit: HBASE-19927 Addendum join on RegionServerThread instead of HRegionServer

[zhangduo]

HBASE-19927 Addendum join on RegionServerThread instead of HRegionServer


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

Branch: refs/heads/HBASE-19397-branch-2
Commit: 8b6b3326a6e7f3bae66dad6fb727b2cd983ab4a3
Parents: 5905415
Author: zhangduo 
Authored: Tue Feb 6 10:01:23 2018 +0800
Committer: zhangduo 
Committed: Tue Feb 6 10:01:41 2018 +0800

--
 .../java/org/apache/hadoop/hbase/HBaseTestingUtility.java   | 3 +--
 .../org/apache/hadoop/hbase/TestFullLogReconstruction.java  | 9 +
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8b6b3326/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index ecd2fa5..4f55199 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -2635,11 +2635,10 @@ public class HBaseTestingUtility extends 
HBaseZKTestingUtility {
* Expire a region server's session
* @param index which RS
*/
-  public HRegionServer expireRegionServerSession(int index) throws Exception {
+  public void expireRegionServerSession(int index) throws Exception {
 HRegionServer rs = getMiniHBaseCluster().getRegionServer(index);
 expireSession(rs.getZooKeeper(), false);
 decrementMinRegionServerCount();
-return rs;
   }
 
   private void decrementMinRegionServerCount() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/8b6b3326/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
index 13c616f..87152fc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
@@ -22,10 +22,10 @@ import static org.junit.Assert.assertEquals;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;
 import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -81,19 +81,20 @@ public class TestFullLogReconstruction {
 for (int i = 0; i < 4; i++) {
   TEST_UTIL.loadTable(table, FAMILY);
 }
-HRegionServer rs = TEST_UTIL.expireRegionServerSession(0);
+RegionServerThread rsThread = 
TEST_UTIL.getHBaseCluster().getRegionServerThreads().get(0);
+TEST_UTIL.expireRegionServerSession(0);
 // make sure that the RS is fully down before reading, so that we will 
read the data from other
 // RSes.
 TEST_UTIL.waitFor(3, new ExplainingPredicate() {
 
   @Override
   public boolean evaluate() throws Exception {
-return !rs.isAlive();
+return !rsThread.isAlive();
   }
 
   @Override
   public String explainFailure() throws Exception {
-return rs + " is still alive";
+return rsThread.getRegionServer() + " is still alive";
   }
 });
 

hbase git commit: HBASE-19927 Addendum join on RegionServerThread instead of HRegionServer

[zhangduo]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 5905415f9 -> 8b6b3326a


HBASE-19927 Addendum join on RegionServerThread instead of HRegionServer


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

Branch: refs/heads/branch-2
Commit: 8b6b3326a6e7f3bae66dad6fb727b2cd983ab4a3
Parents: 5905415
Author: zhangduo 
Authored: Tue Feb 6 10:01:23 2018 +0800
Committer: zhangduo 
Committed: Tue Feb 6 10:01:41 2018 +0800

--
 .../java/org/apache/hadoop/hbase/HBaseTestingUtility.java   | 3 +--
 .../org/apache/hadoop/hbase/TestFullLogReconstruction.java  | 9 +
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8b6b3326/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index ecd2fa5..4f55199 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -2635,11 +2635,10 @@ public class HBaseTestingUtility extends 
HBaseZKTestingUtility {
* Expire a region server's session
* @param index which RS
*/
-  public HRegionServer expireRegionServerSession(int index) throws Exception {
+  public void expireRegionServerSession(int index) throws Exception {
 HRegionServer rs = getMiniHBaseCluster().getRegionServer(index);
 expireSession(rs.getZooKeeper(), false);
 decrementMinRegionServerCount();
-return rs;
   }
 
   private void decrementMinRegionServerCount() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/8b6b3326/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
index 13c616f..87152fc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
@@ -22,10 +22,10 @@ import static org.junit.Assert.assertEquals;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;
 import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -81,19 +81,20 @@ public class TestFullLogReconstruction {
 for (int i = 0; i < 4; i++) {
   TEST_UTIL.loadTable(table, FAMILY);
 }
-HRegionServer rs = TEST_UTIL.expireRegionServerSession(0);
+RegionServerThread rsThread = 
TEST_UTIL.getHBaseCluster().getRegionServerThreads().get(0);
+TEST_UTIL.expireRegionServerSession(0);
 // make sure that the RS is fully down before reading, so that we will 
read the data from other
 // RSes.
 TEST_UTIL.waitFor(3, new ExplainingPredicate() {
 
   @Override
   public boolean evaluate() throws Exception {
-return !rs.isAlive();
+return !rsThread.isAlive();
   }
 
   @Override
   public String explainFailure() throws Exception {
-return rs + " is still alive";
+return rsThread.getRegionServer() + " is still alive";
   }
 });
 

hbase git commit: HBASE-19927 Addendum join on RegionServerThread instead of HRegionServer

[zhangduo]

Repository: hbase
Updated Branches:
  refs/heads/master 6d04aa179 -> f5197979a


HBASE-19927 Addendum join on RegionServerThread instead of HRegionServer


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

Branch: refs/heads/master
Commit: f5197979aaac7e36b6af36b86ea8dc8d7774fabe
Parents: 6d04aa1
Author: zhangduo 
Authored: Tue Feb 6 10:01:23 2018 +0800
Committer: zhangduo 
Committed: Tue Feb 6 10:01:23 2018 +0800

--
 .../java/org/apache/hadoop/hbase/HBaseTestingUtility.java   | 3 +--
 .../org/apache/hadoop/hbase/TestFullLogReconstruction.java  | 9 +
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f5197979/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
index ecd2fa5..4f55199 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
@@ -2635,11 +2635,10 @@ public class HBaseTestingUtility extends 
HBaseZKTestingUtility {
* Expire a region server's session
* @param index which RS
*/
-  public HRegionServer expireRegionServerSession(int index) throws Exception {
+  public void expireRegionServerSession(int index) throws Exception {
 HRegionServer rs = getMiniHBaseCluster().getRegionServer(index);
 expireSession(rs.getZooKeeper(), false);
 decrementMinRegionServerCount();
-return rs;
   }
 
   private void decrementMinRegionServerCount() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/f5197979/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
index 13c616f..87152fc 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
@@ -22,10 +22,10 @@ import static org.junit.Assert.assertEquals;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;
 import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.MiscTests;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -81,19 +81,20 @@ public class TestFullLogReconstruction {
 for (int i = 0; i < 4; i++) {
   TEST_UTIL.loadTable(table, FAMILY);
 }
-HRegionServer rs = TEST_UTIL.expireRegionServerSession(0);
+RegionServerThread rsThread = 
TEST_UTIL.getHBaseCluster().getRegionServerThreads().get(0);
+TEST_UTIL.expireRegionServerSession(0);
 // make sure that the RS is fully down before reading, so that we will 
read the data from other
 // RSes.
 TEST_UTIL.waitFor(3, new ExplainingPredicate() {
 
   @Override
   public boolean evaluate() throws Exception {
-return !rs.isAlive();
+return !rsThread.isAlive();
   }
 
   @Override
   public String explainFailure() throws Exception {
-return rs + " is still alive";
+return rsThread.getRegionServer() + " is still alive";
   }
 });