You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by wc...@apache.org on 2019/11/27 12:15:52 UTC
[hbase] branch branch-2 updated: HBASE-23313 [hbck2] setRegionState should update Master in-memory sta… (#864)
This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 70bbc38 HBASE-23313 [hbck2] setRegionState should update Master in-memory sta… (#864)
70bbc38 is described below
commit 70bbc38aaefa7af336e274296766d4f3ece4646e
Author: Wellington Ramos Chevreuil <wc...@apache.org>
AuthorDate: Wed Nov 27 08:41:23 2019 +0000
HBASE-23313 [hbck2] setRegionState should update Master in-memory sta… (#864)
Signed-off-by: Mingliang Liu <li...@apache.org>
Signed-off-by: stack <st...@apache.org>
---
.../org/apache/hadoop/hbase/client/HBaseHbck.java | 34 +++++++++++++++---
.../java/org/apache/hadoop/hbase/client/Hbck.java | 9 +++++
.../hadoop/hbase/client/RegionInfoBuilder.java | 5 +++
.../hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 12 +++++++
.../hbase/shaded/protobuf/RequestConverter.java | 14 ++++++++
.../src/main/protobuf/HBase.proto | 1 +
.../src/main/protobuf/Master.proto | 12 +++++++
.../hadoop/hbase/master/MasterRpcServices.java | 40 ++++++++++++++++++++++
.../org/apache/hadoop/hbase/client/TestHbck.java | 35 +++++++++++++++++++
9 files changed, 157 insertions(+), 5 deletions(-)
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java
index d322333..b776dad 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java
@@ -18,19 +18,19 @@
package org.apache.hadoop.hbase.client;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.stream.Collectors;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.ServerName;
-import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
-import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
+import org.apache.hadoop.hbase.master.RegionState;
+import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.AssignsResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BypassProcedureRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.BypassProcedureResponse;
@@ -44,6 +44,11 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.UnassignsR
import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;
+import org.apache.yetus.audience.InterfaceAudience;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Use {@link ClusterConnection#getHbck()} to obtain an instance of {@link Hbck} instead of
* constructing an HBaseHbck directly.
@@ -108,6 +113,25 @@ public class HBaseHbck implements Hbck {
}
@Override
+ public List<RegionState> setRegionStateInMeta(List<RegionState> states) throws IOException {
+ try {
+ if(LOG.isDebugEnabled()) {
+ states.forEach(s ->
+ LOG.debug("region={}, state={}", s.getRegion().getRegionName(), s.getState())
+ );
+ }
+ MasterProtos.GetRegionStateInMetaResponse response = hbck.setRegionStateInMeta(
+ rpcControllerFactory.newController(),
+ RequestConverter.buildSetRegionStateInMetaRequest(states));
+ final List<RegionState> result = new ArrayList<>();
+ response.getStatesList().forEach(s -> result.add(RegionState.convert(s)));
+ return result;
+ } catch (ServiceException se) {
+ throw new IOException(se);
+ }
+ }
+
+ @Override
public List<Long> assigns(List<String> encodedRegionNames, boolean override)
throws IOException {
try {
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Hbck.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Hbck.java
index 5fe2c8e..5d7479c 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Hbck.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Hbck.java
@@ -27,6 +27,7 @@ import org.apache.hadoop.hbase.Abortable;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.master.RegionState;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
@@ -56,6 +57,14 @@ public interface Hbck extends Abortable, Closeable {
TableState setTableStateInMeta(TableState state) throws IOException;
/**
+ * Update region state in Meta only. No procedures are submitted to manipulate the given region
+ * or any other region from same table.
+ * @param states list of all region states to be updated in meta
+ * @return previous state of the region in Meta
+ */
+ List<RegionState> setRegionStateInMeta(List<RegionState> states) throws IOException;
+
+ /**
* Like {@link Admin#assign(byte[])} but 'raw' in that it can do more than one Region at a time
* -- good if many Regions to online -- and it will schedule the assigns even in the case where
* Master is initializing (as long as the ProcedureExecutor is up). Does NOT call Coprocessor
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionInfoBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionInfoBuilder.java
index cd9e40b..e79a7b7 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionInfoBuilder.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionInfoBuilder.java
@@ -116,6 +116,11 @@ public class RegionInfoBuilder {
return this;
}
+ public RegionInfoBuilder setEncodedName(String encodedName) {
+ this.encodedName = encodedName;
+ return this;
+ }
+
public RegionInfo build() {
return new MutableRegionInfo(tableName, startKey, endKey, split,
regionId, replicaId, offLine, regionName, encodedName);
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 5223551..ec32e96 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
@@ -2238,6 +2238,14 @@ public final class ProtobufUtil {
.setQualifier(UnsafeByteOperations.unsafeWrap(tableName.getQualifier())).build();
}
+ public static HBaseProtos.RegionInfo toProtoRegionInfo(
+ org.apache.hadoop.hbase.client.RegionInfo regionInfo) {
+ return HBaseProtos.RegionInfo.newBuilder()
+ .setRegionId(regionInfo.getRegionId())
+ .setRegionEncodedName(regionInfo.getEncodedName())
+ .setTableName(toProtoTableName(regionInfo.getTable())).build();
+ }
+
public static List<TableName> toTableNameList(List<HBaseProtos.TableName> tableNamesList) {
if (tableNamesList == null) {
return new ArrayList<>();
@@ -3157,6 +3165,7 @@ public final class ProtobufUtil {
builder.setOffline(info.isOffline());
builder.setSplit(info.isSplit());
builder.setReplicaId(info.getReplicaId());
+ builder.setRegionEncodedName(info.getEncodedName());
return builder.build();
}
@@ -3196,6 +3205,9 @@ public final class ProtobufUtil {
if (proto.hasOffline()) {
rib.setOffline(proto.getOffline());
}
+ if (proto.hasRegionEncodedName()) {
+ rib.setEncodedName(proto.getRegionEncodedName());
+ }
return rib.build();
}
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java
index 151a454..24f8009 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/RequestConverter.java
@@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.client.replication.ReplicationPeerConfigUtil;
import org.apache.hadoop.hbase.exceptions.DeserializationException;
import org.apache.hadoop.hbase.filter.ByteArrayComparable;
import org.apache.hadoop.hbase.io.TimeRange;
+import org.apache.hadoop.hbase.master.RegionState;
import org.apache.hadoop.hbase.replication.ReplicationPeerConfig;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@@ -136,6 +137,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.RunCleaner
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetBalancerRunningRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetCleanerChoreRunningRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetNormalizerRunningRequest;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetRegionStateInMetaRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
.SetSnapshotCleanupRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetSplitOrMergeEnabledRequest;
@@ -1443,6 +1445,18 @@ public final class RequestConverter {
}
/**
+ * Creates a protocol buffer SetRegionStateInMetaRequest
+ * @param states list of regions states to update in Meta
+ * @return a SetRegionStateInMetaRequest
+ */
+ public static SetRegionStateInMetaRequest buildSetRegionStateInMetaRequest(
+ final List<RegionState> states) {
+ final SetRegionStateInMetaRequest.Builder builder = SetRegionStateInMetaRequest.newBuilder();
+ states.forEach(s -> builder.addStates(s.convert()));
+ return builder.build();
+ }
+
+ /**
* Creates a protocol buffer GetTableDescriptorsRequest for a single table
*
* @param tableName the table name
diff --git a/hbase-protocol-shaded/src/main/protobuf/HBase.proto b/hbase-protocol-shaded/src/main/protobuf/HBase.proto
index 1ffcaeb..3b28fea 100644
--- a/hbase-protocol-shaded/src/main/protobuf/HBase.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/HBase.proto
@@ -79,6 +79,7 @@ message RegionInfo {
optional bool offline = 5;
optional bool split = 6;
optional int32 replica_id = 7 [default = 0];
+ optional string region_encoded_name = 8;
}
/**
diff --git a/hbase-protocol-shaded/src/main/protobuf/Master.proto b/hbase-protocol-shaded/src/main/protobuf/Master.proto
index ce1d08a..45e8068 100644
--- a/hbase-protocol-shaded/src/main/protobuf/Master.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/Master.proto
@@ -517,6 +517,10 @@ message GetTableStateResponse {
required TableState table_state = 1;
}
+message GetRegionStateInMetaResponse {
+ repeated RegionState states = 1;
+}
+
message GetClusterStatusRequest {
repeated Option options = 1;
@@ -1086,6 +1090,10 @@ message SetTableStateInMetaRequest {
required TableState table_state = 2;
}
+message SetRegionStateInMetaRequest {
+ repeated RegionState states = 2;
+}
+
/** Like Admin's AssignRegionRequest except it can
* take one or more Regions at a time.
*/
@@ -1148,6 +1156,10 @@ service HbckService {
rpc SetTableStateInMeta(SetTableStateInMetaRequest)
returns(GetTableStateResponse);
+ /** Update state of the region in meta only*/
+ rpc SetRegionStateInMeta(SetRegionStateInMetaRequest)
+ returns(GetRegionStateInMetaResponse);
+
/**
* Assign regions.
* Like Admin's assign but works even if the
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
index a4f4f32..6cd7eef 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
@@ -48,6 +48,7 @@ import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.UnknownRegionException;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.MasterSwitchType;
+import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.RegionInfoBuilder;
import org.apache.hadoop.hbase.client.Table;
@@ -197,6 +198,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedu
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProcedureResultResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProceduresRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetProceduresResponse;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetRegionStateInMetaResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetSchemaAlterStatusResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetTableDescriptorsRequest;
@@ -276,6 +278,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetNormali
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetNormalizerRunningResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaResponse;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetRegionStateInMetaRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
.SetSnapshotCleanupRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
@@ -2434,6 +2437,42 @@ public class MasterRpcServices extends RSRpcServices
}
/**
+ * Update state of the region in meta only. This is required by hbck in some situations to cleanup
+ * stuck assign/ unassign regions procedures for the table.
+ *
+ * @return previous states of the regions
+ */
+ @Override
+ public GetRegionStateInMetaResponse setRegionStateInMeta(RpcController controller,
+ SetRegionStateInMetaRequest request) throws ServiceException {
+ final GetRegionStateInMetaResponse.Builder builder = GetRegionStateInMetaResponse.newBuilder();
+ for(ClusterStatusProtos.RegionState s : request.getStatesList()) {
+ try {
+ RegionInfo info = this.master.getAssignmentManager().
+ loadRegionFromMeta(s.getRegionInfo().getRegionEncodedName());
+ LOG.trace("region info loaded from meta table: {}", info);
+ RegionState prevState = this.master.getAssignmentManager().getRegionStates().
+ getRegionState(info);
+ RegionState newState = RegionState.convert(s);
+ LOG.info("{} set region={} state from {} to {}", master.getClientIdAuditPrefix(), info,
+ prevState.getState(), newState.getState());
+ Put metaPut = MetaTableAccessor.makePutFromRegionInfo(info, System.currentTimeMillis());
+ metaPut.addColumn(HConstants.CATALOG_FAMILY, HConstants.STATE_QUALIFIER,
+ Bytes.toBytes(newState.getState().name()));
+ List<Put> putList = new ArrayList<>();
+ putList.add(metaPut);
+ MetaTableAccessor.putsToMetaTable(this.master.getConnection(), putList);
+ //Loads from meta again to refresh AM cache with the new region state
+ this.master.getAssignmentManager().loadRegionFromMeta(info.getEncodedName());
+ builder.addStates(prevState.convert());
+ } catch (Exception e) {
+ throw new ServiceException(e);
+ }
+ }
+ return builder.build();
+ }
+
+ /**
* Get RegionInfo from Master using content of RegionSpecifier as key.
* @return RegionInfo found by decoding <code>rs</code> or null if none found
*/
@@ -2818,4 +2857,5 @@ public class MasterRpcServices extends RSRpcServices
}
return true;
}
+
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java
index 7149d1b..0a8e0e1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java
@@ -21,8 +21,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CountDownLatch;
import java.util.stream.Collectors;
@@ -39,6 +42,7 @@ import org.apache.hadoop.hbase.coprocessor.MasterObserver;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.RegionState;
+import org.apache.hadoop.hbase.master.assignment.AssignmentManager;
import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;
import org.apache.hadoop.hbase.master.procedure.TableProcedureInterface;
import org.apache.hadoop.hbase.procedure2.Procedure;
@@ -49,6 +53,7 @@ import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.Pair;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -184,6 +189,36 @@ public class TestHbck {
}
@Test
+ public void testSetRegionStateInMeta() throws Exception {
+ Hbck hbck = getHbck();
+ try(Admin admin = TEST_UTIL.getAdmin()){
+ final List<RegionInfo> regions = admin.getRegions(TABLE_NAME);
+ final AssignmentManager am = TEST_UTIL.getHBaseCluster().getMaster().getAssignmentManager();
+ final List<RegionState> prevStates = new ArrayList<>();
+ final List<RegionState> newStates = new ArrayList<>();
+ final Map<String, Pair<RegionState, RegionState>> regionsMap = new HashMap<>();
+ regions.forEach(r -> {
+ RegionState prevState = am.getRegionStates().getRegionState(r);
+ prevStates.add(prevState);
+ RegionState newState = RegionState.createForTesting(r, RegionState.State.CLOSED);
+ newStates.add(newState);
+ regionsMap.put(r.getEncodedName(), new Pair<>(prevState, newState));
+ });
+ final List<RegionState> result = hbck.setRegionStateInMeta(newStates);
+ result.forEach(r -> {
+ RegionState prevState = regionsMap.get(r.getRegion().getEncodedName()).getFirst();
+ assertEquals(prevState.getState(), r.getState());
+ });
+ regions.forEach(r -> {
+ RegionState cachedState = am.getRegionStates().getRegionState(r.getEncodedName());
+ RegionState newState = regionsMap.get(r.getEncodedName()).getSecond();
+ assertEquals(newState.getState(), cachedState.getState());
+ });
+ hbck.setRegionStateInMeta(prevStates);
+ }
+ }
+
+ @Test
public void testAssigns() throws Exception {
Hbck hbck = getHbck();
try (Admin admin = TEST_UTIL.getConnection().getAdmin()) {