[hbase] 02/06: HBASE-23281: Track meta region locations in masters (#830)
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch HBASE-18095/client-locate-meta-no-zookeeper
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 8571d389cfe7bb18dafad82ca011e78390a21061
Author: Bharath Vissapragada
AuthorDate: Wed Dec 4 15:26:58 2019 -0800
HBASE-23281: Track meta region locations in masters (#830)
* HBASE-23281: Track meta region changes on masters
This patch adds a simple cache that tracks the meta region replica
locations. It keeps an eye on the region movements so that the
cached locations are not stale.
This information is used for servicing client RPCs for connections
that use master based registry (HBASE-18095). The RPC end points
will be added in a separate patch.
Signed-off-by: Nick Dimiduk
---
.../hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 42 +++-
.../apache/hadoop/hbase/zookeeper/ZNodePaths.java | 19 +-
.../org/apache/hadoop/hbase/master/HMaster.java| 18 +-
.../hbase/master/MetaRegionLocationCache.java | 249 +
.../hbase/client/TestMetaRegionLocationCache.java | 186 +++
.../hbase/master/TestCloseAnOpeningRegion.java | 5 +-
.../hbase/master/TestClusterRestartFailover.java | 3 +-
.../master/TestRegionsRecoveryConfigManager.java | 5 +-
.../hbase/master/TestShutdownBackupMaster.java | 3 +-
.../assignment/TestOpenRegionProcedureBackoff.java | 3 +-
.../assignment/TestOpenRegionProcedureHang.java| 2 +-
.../TestRegionAssignedToMultipleRegionServers.java | 3 +-
.../assignment/TestReportOnlineRegionsRace.java| 3 +-
...tReportRegionStateTransitionFromDeadServer.java | 3 +-
.../TestReportRegionStateTransitionRetry.java | 3 +-
.../master/assignment/TestSCPGetRegionsRace.java | 3 +-
.../assignment/TestWakeUpUnexpectedProcedure.java | 3 +-
.../TestRegisterPeerWorkerWhenRestarting.java | 3 +-
.../hadoop/hbase/protobuf/TestProtobufUtil.java| 36 ++-
.../TestRegionServerReportForDuty.java | 2 +-
.../replication/TestReplicationProcedureRetry.java | 3 +-
.../hadoop/hbase/zookeeper/MetaTableLocator.java | 36 +--
.../apache/hadoop/hbase/zookeeper/ZKWatcher.java | 37 ++-
23 files changed, 586 insertions(+), 84 deletions(-)
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
index 5a71917..2adcea9 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -80,6 +80,7 @@ import
org.apache.hadoop.hbase.client.PackagePrivateFieldAccessor;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RegionInfoBuilder;
import org.apache.hadoop.hbase.client.RegionLoadStats;
+import org.apache.hadoop.hbase.client.RegionReplicaUtil;
import org.apache.hadoop.hbase.client.RegionStatesCount;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
@@ -93,6 +94,7 @@ import
org.apache.hadoop.hbase.exceptions.DeserializationException;
import org.apache.hadoop.hbase.filter.ByteArrayComparable;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.io.TimeRange;
+import org.apache.hadoop.hbase.master.RegionState;
import org.apache.hadoop.hbase.protobuf.ProtobufMagic;
import org.apache.hadoop.hbase.protobuf.ProtobufMessageConverter;
import org.apache.hadoop.hbase.quotas.QuotaScope;
@@ -3068,6 +3070,44 @@ public final class ProtobufUtil {
}
/**
+ * Get the Meta region state from the passed data bytes. Can handle both old
and new style
+ * server names.
+ * @param data protobuf serialized data with meta server name.
+ * @param replicaId replica ID for this region
+ * @return RegionState instance corresponding to the serialized data.
+ * @throws DeserializationException if the data is invalid.
+ */
+ public static RegionState parseMetaRegionStateFrom(final byte[] data, int
replicaId)
+ throws DeserializationException {
+RegionState.State state = RegionState.State.OPEN;
+ServerName serverName;
+if (data != null && data.length > 0 && ProtobufUtil.isPBMagicPrefix(data))
{
+ try {
+int prefixLen = ProtobufUtil.lengthOfPBMagic();
+ZooKeeperProtos.MetaRegionServer rl =
+ZooKeeperProtos.MetaRegionServer.parser().parseFrom(data,
prefixLen,
+data.length - prefixLen);
+if (rl.hasState()) {
+ state = RegionState.State.convert(rl.getState());
+}
+
[hbase] 02/06: HBASE-23281: Track meta region locations in masters (#830)
This is an automated email from the ASF dual-hosted git repository.
ndimiduk pushed a commit to branch HBASE-18095/client-locate-meta-no-zookeeper
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 8d4314fd2cf55e22dcaebaf13c401749e5a2dbd1
Author: Bharath Vissapragada
AuthorDate: Wed Dec 4 15:26:58 2019 -0800
HBASE-23281: Track meta region locations in masters (#830)
* HBASE-23281: Track meta region changes on masters
This patch adds a simple cache that tracks the meta region replica
locations. It keeps an eye on the region movements so that the
cached locations are not stale.
This information is used for servicing client RPCs for connections
that use master based registry (HBASE-18095). The RPC end points
will be added in a separate patch.
Signed-off-by: Nick Dimiduk
---
.../hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 42 +++-
.../apache/hadoop/hbase/zookeeper/ZNodePaths.java | 19 +-
.../org/apache/hadoop/hbase/master/HMaster.java| 18 +-
.../hbase/master/MetaRegionLocationCache.java | 249 +
.../hbase/client/TestMetaRegionLocationCache.java | 186 +++
.../hbase/master/TestCloseAnOpeningRegion.java | 5 +-
.../hbase/master/TestClusterRestartFailover.java | 3 +-
.../master/TestRegionsRecoveryConfigManager.java | 5 +-
.../hbase/master/TestShutdownBackupMaster.java | 3 +-
.../assignment/TestOpenRegionProcedureBackoff.java | 3 +-
.../assignment/TestOpenRegionProcedureHang.java| 2 +-
.../TestRegionAssignedToMultipleRegionServers.java | 3 +-
.../assignment/TestReportOnlineRegionsRace.java| 3 +-
...tReportRegionStateTransitionFromDeadServer.java | 3 +-
.../TestReportRegionStateTransitionRetry.java | 3 +-
.../master/assignment/TestSCPGetRegionsRace.java | 3 +-
.../assignment/TestWakeUpUnexpectedProcedure.java | 3 +-
.../TestRegisterPeerWorkerWhenRestarting.java | 3 +-
.../hadoop/hbase/protobuf/TestProtobufUtil.java| 36 ++-
.../TestRegionServerReportForDuty.java | 2 +-
.../replication/TestReplicationProcedureRetry.java | 3 +-
.../hadoop/hbase/zookeeper/MetaTableLocator.java | 38 +---
.../apache/hadoop/hbase/zookeeper/ZKWatcher.java | 37 ++-
23 files changed, 586 insertions(+), 86 deletions(-)
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
index 5a71917..2adcea9 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -80,6 +80,7 @@ import
org.apache.hadoop.hbase.client.PackagePrivateFieldAccessor;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RegionInfoBuilder;
import org.apache.hadoop.hbase.client.RegionLoadStats;
+import org.apache.hadoop.hbase.client.RegionReplicaUtil;
import org.apache.hadoop.hbase.client.RegionStatesCount;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
@@ -93,6 +94,7 @@ import
org.apache.hadoop.hbase.exceptions.DeserializationException;
import org.apache.hadoop.hbase.filter.ByteArrayComparable;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.io.TimeRange;
+import org.apache.hadoop.hbase.master.RegionState;
import org.apache.hadoop.hbase.protobuf.ProtobufMagic;
import org.apache.hadoop.hbase.protobuf.ProtobufMessageConverter;
import org.apache.hadoop.hbase.quotas.QuotaScope;
@@ -3068,6 +3070,44 @@ public final class ProtobufUtil {
}
/**
+ * Get the Meta region state from the passed data bytes. Can handle both old
and new style
+ * server names.
+ * @param data protobuf serialized data with meta server name.
+ * @param replicaId replica ID for this region
+ * @return RegionState instance corresponding to the serialized data.
+ * @throws DeserializationException if the data is invalid.
+ */
+ public static RegionState parseMetaRegionStateFrom(final byte[] data, int
replicaId)
+ throws DeserializationException {
+RegionState.State state = RegionState.State.OPEN;
+ServerName serverName;
+if (data != null && data.length > 0 && ProtobufUtil.isPBMagicPrefix(data))
{
+ try {
+int prefixLen = ProtobufUtil.lengthOfPBMagic();
+ZooKeeperProtos.MetaRegionServer rl =
+ZooKeeperProtos.MetaRegionServer.parser().parseFrom(data,
prefixLen,
+data.length - prefixLen);
+if (rl.hasState()) {
+ state = RegionState.State.convert(rl.getState());
+}
+
