[03/12] hbase git commit: HBASE-20722 Make RegionServerTracker only depend on children changed event

2018-06-14 Thread busbey 
HBASE-20722 Make RegionServerTracker only depend on children changed event


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

Branch: refs/heads/HBASE-20331
Commit: 423a0ab71a4e588f3efd2d2ab96a36c16e8b37b1
Parents: ec66434
Author: zhangduo 
Authored: Wed Jun 13 21:11:23 2018 +0800
Committer: zhangduo 
Committed: Thu Jun 14 08:36:37 2018 +0800

--
 .../hadoop/hbase/client/VersionInfoUtil.java|   2 +-
 .../org/apache/hadoop/hbase/master/HMaster.java |  64 +++---
 .../hbase/master/RegionServerTracker.java   | 225 ++-
 .../hadoop/hbase/master/ServerManager.java  |  17 +-
 .../hbase/master/TestAssignmentListener.java|  98 +---
 .../hbase/master/TestClockSkewDetection.java|   2 +-
 .../hbase/master/TestMasterNoCluster.java   |  18 +-
 .../hbase/master/TestShutdownBackupMaster.java  |   2 +-
 8 files changed, 167 insertions(+), 261 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/423a0ab7/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
index 95984de..cde59eb 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
@@ -102,7 +102,7 @@ public final class VersionInfoUtil {
* @param versionInfo the VersionInfo object to pack
* @return the version number as int. (e.g. 0x0103004 is 1.3.4)
*/
-  private static int getVersionNumber(final HBaseProtos.VersionInfo 
versionInfo) {
+  public static int getVersionNumber(final HBaseProtos.VersionInfo 
versionInfo) {
 if (versionInfo != null) {
   try {
 final String[] components = getVersionComponents(versionInfo);

http://git-wip-us.apache.org/repos/asf/hbase/blob/423a0ab7/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index f20cc61..883bb4f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -72,7 +72,6 @@ import org.apache.hadoop.hbase.NamespaceDescriptor;
 import org.apache.hadoop.hbase.PleaseHoldException;
 import org.apache.hadoop.hbase.ReplicationPeerNotFoundException;
 import org.apache.hadoop.hbase.ScheduledChore;
-import org.apache.hadoop.hbase.ServerMetricsBuilder;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableDescriptors;
 import org.apache.hadoop.hbase.TableName;
@@ -87,6 +86,7 @@ import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.client.TableState;
+import org.apache.hadoop.hbase.client.VersionInfoUtil;
 import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.exceptions.MergeRegionException;
@@ -212,7 +212,6 @@ import 
org.apache.hbase.thirdparty.com.google.common.collect.Maps;
 
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState;
-import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionServerInfo;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceViolationPolicy;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;
@@ -297,7 +296,7 @@ public class HMaster extends HRegionServer implements 
MasterServices {
   // Manager and zk listener for master election
   private final ActiveMasterManager activeMasterManager;
   // Region server tracker
-  RegionServerTracker regionServerTracker;
+  private RegionServerTracker regionServerTracker;
   // Draining region server tracker
   private DrainingServerTracker drainingServerTracker;
   // Tracker for load balancer state
@@ -725,10 +724,16 @@ public class HMaster extends HRegionServer implements 
MasterServices {
   }
 
   /**
+   * 
* Initialize all ZK based system trackers.
+

hbase git commit: HBASE-20722 Make RegionServerTracker only depend on children changed event

2018-06-13 Thread zhangduo 
Repository: hbase
Updated Branches:
  refs/heads/master ec6643438 -> 423a0ab71


HBASE-20722 Make RegionServerTracker only depend on children changed event


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

Branch: refs/heads/master
Commit: 423a0ab71a4e588f3efd2d2ab96a36c16e8b37b1
Parents: ec66434
Author: zhangduo 
Authored: Wed Jun 13 21:11:23 2018 +0800
Committer: zhangduo 
Committed: Thu Jun 14 08:36:37 2018 +0800

--
 .../hadoop/hbase/client/VersionInfoUtil.java|   2 +-
 .../org/apache/hadoop/hbase/master/HMaster.java |  64 +++---
 .../hbase/master/RegionServerTracker.java   | 225 ++-
 .../hadoop/hbase/master/ServerManager.java  |  17 +-
 .../hbase/master/TestAssignmentListener.java|  98 +---
 .../hbase/master/TestClockSkewDetection.java|   2 +-
 .../hbase/master/TestMasterNoCluster.java   |  18 +-
 .../hbase/master/TestShutdownBackupMaster.java  |   2 +-
 8 files changed, 167 insertions(+), 261 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/423a0ab7/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
index 95984de..cde59eb 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
@@ -102,7 +102,7 @@ public final class VersionInfoUtil {
* @param versionInfo the VersionInfo object to pack
* @return the version number as int. (e.g. 0x0103004 is 1.3.4)
*/
-  private static int getVersionNumber(final HBaseProtos.VersionInfo 
versionInfo) {
+  public static int getVersionNumber(final HBaseProtos.VersionInfo 
versionInfo) {
 if (versionInfo != null) {
   try {
 final String[] components = getVersionComponents(versionInfo);

http://git-wip-us.apache.org/repos/asf/hbase/blob/423a0ab7/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index f20cc61..883bb4f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -72,7 +72,6 @@ import org.apache.hadoop.hbase.NamespaceDescriptor;
 import org.apache.hadoop.hbase.PleaseHoldException;
 import org.apache.hadoop.hbase.ReplicationPeerNotFoundException;
 import org.apache.hadoop.hbase.ScheduledChore;
-import org.apache.hadoop.hbase.ServerMetricsBuilder;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableDescriptors;
 import org.apache.hadoop.hbase.TableName;
@@ -87,6 +86,7 @@ import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.client.TableState;
+import org.apache.hadoop.hbase.client.VersionInfoUtil;
 import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.exceptions.MergeRegionException;
@@ -212,7 +212,6 @@ import 
org.apache.hbase.thirdparty.com.google.common.collect.Maps;
 
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState;
-import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionServerInfo;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceViolationPolicy;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;
@@ -297,7 +296,7 @@ public class HMaster extends HRegionServer implements 
MasterServices {
   // Manager and zk listener for master election
   private final ActiveMasterManager activeMasterManager;
   // Region server tracker
-  RegionServerTracker regionServerTracker;
+  private RegionServerTracker regionServerTracker;
   // Draining region server tracker
   private DrainingServerTracker drainingServerTracker;
   // Tracker for load balancer state
@@ -725,10 +724,16 @@ public class HMaster extends HRegionServer implements

hbase git commit: HBASE-20722 Make RegionServerTracker only depend on children changed event

2018-06-13 Thread zhangduo 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 075523dd1 -> 161dc7c7f


HBASE-20722 Make RegionServerTracker only depend on children changed event


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

Branch: refs/heads/branch-2
Commit: 161dc7c7f3101d62240e291939bd86aeff8895ba
Parents: 075523d
Author: zhangduo 
Authored: Wed Jun 13 21:11:23 2018 +0800
Committer: zhangduo 
Committed: Thu Jun 14 08:38:53 2018 +0800

--
 .../hadoop/hbase/client/VersionInfoUtil.java|   2 +-
 .../org/apache/hadoop/hbase/master/HMaster.java |  62 ++---
 .../hbase/master/RegionServerTracker.java   | 225 ++-
 .../hadoop/hbase/master/ServerManager.java  |  17 +-
 .../hbase/master/TestAssignmentListener.java|  98 +---
 .../hbase/master/TestClockSkewDetection.java|   2 +-
 .../hbase/master/TestMasterNoCluster.java   |  20 +-
 .../hbase/master/TestShutdownBackupMaster.java  |   2 +-
 8 files changed, 167 insertions(+), 261 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/161dc7c7/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
index 95984de..cde59eb 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/VersionInfoUtil.java
@@ -102,7 +102,7 @@ public final class VersionInfoUtil {
* @param versionInfo the VersionInfo object to pack
* @return the version number as int. (e.g. 0x0103004 is 1.3.4)
*/
-  private static int getVersionNumber(final HBaseProtos.VersionInfo 
versionInfo) {
+  public static int getVersionNumber(final HBaseProtos.VersionInfo 
versionInfo) {
 if (versionInfo != null) {
   try {
 final String[] components = getVersionComponents(versionInfo);

http://git-wip-us.apache.org/repos/asf/hbase/blob/161dc7c7/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index fcb9989..433944d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -72,7 +72,6 @@ import org.apache.hadoop.hbase.NamespaceDescriptor;
 import org.apache.hadoop.hbase.PleaseHoldException;
 import org.apache.hadoop.hbase.ReplicationPeerNotFoundException;
 import org.apache.hadoop.hbase.ScheduledChore;
-import org.apache.hadoop.hbase.ServerMetricsBuilder;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableDescriptors;
 import org.apache.hadoop.hbase.TableName;
@@ -87,6 +86,7 @@ import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.client.TableState;
+import org.apache.hadoop.hbase.client.VersionInfoUtil;
 import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.exceptions.MergeRegionException;
@@ -212,7 +212,6 @@ import 
org.apache.hbase.thirdparty.com.google.common.collect.Maps;
 
 import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState;
-import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionServerInfo;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.SpaceViolationPolicy;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;
@@ -297,7 +296,7 @@ public class HMaster extends HRegionServer implements 
MasterServices {
   // Manager and zk listener for master election
   private final ActiveMasterManager activeMasterManager;
   // Region server tracker
-  RegionServerTracker regionServerTracker;
+  private RegionServerTracker regionServerTracker;
   // Draining region server tracker
   private DrainingServerTracker drainingServerTracker;
   // Tracker for load balancer state
@@ -725,9 +724,15 @@ public class HMaster extends HRegionServer implements