Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-20702 Processing crash, skip ONLINE'ing empty rows 

Signed-off-by: Josh Elser <elserj@apache.org>
This commit is contained in:
Michael Stack 2018-06-07 09:50:54 -07:00
parent 271d93dc73
commit 858eee20ec
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
View File

@ -48,6 +48,7 @@ import org.apache.hadoop.hbase.YouAreDeadException;
import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.RegionInfoBuilder; import org.apache.hadoop.hbase.client.RegionInfoBuilder;
import org.apache.hadoop.hbase.client.RegionReplicaUtil; import org.apache.hadoop.hbase.client.RegionReplicaUtil;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.TableState; import org.apache.hadoop.hbase.client.TableState;
import org.apache.hadoop.hbase.exceptions.UnexpectedStateException; import org.apache.hadoop.hbase.exceptions.UnexpectedStateException;
import org.apache.hadoop.hbase.favored.FavoredNodesManager; import org.apache.hadoop.hbase.favored.FavoredNodesManager;
@ -77,6 +78,7 @@ import org.apache.hadoop.hbase.procedure2.ProcedureEvent;
import org.apache.hadoop.hbase.procedure2.ProcedureExecutor; import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;
import org.apache.hadoop.hbase.procedure2.ProcedureInMemoryChore; import org.apache.hadoop.hbase.procedure2.ProcedureInMemoryChore;
import org.apache.hadoop.hbase.procedure2.util.StringUtils; import org.apache.hadoop.hbase.procedure2.util.StringUtils;
import org.apache.hadoop.hbase.regionserver.SequenceId;
import org.apache.hadoop.hbase.util.HasThread; import org.apache.hadoop.hbase.util.HasThread;
import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting; import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
@ -1235,9 +1237,14 @@ public class AssignmentManager implements ServerListener {
// TODO: use a thread pool // TODO: use a thread pool
regionStateStore.visitMeta(new RegionStateStore.RegionStateVisitor() { regionStateStore.visitMeta(new RegionStateStore.RegionStateVisitor() {
@Override @Override
public void visitRegionState(final RegionInfo regionInfo, final State state, public void visitRegionState(Result result, final RegionInfo regionInfo, final State state,
final ServerName regionLocation, final ServerName lastHost, final long openSeqNum) { final ServerName regionLocation, final ServerName lastHost, final long openSeqNum) {
final RegionStateNode regionNode = regionStates.getOrCreateRegionStateNode(regionInfo); if (state == null && regionLocation == null && lastHost == null &&
openSeqNum == SequenceId.NO_SEQUENCE_ID) {
// This is a row with nothing in it.
LOG.warn("Skipping empty row={}", result);
return;
}
State localState = state; State localState = state;
if (localState == null) { if (localState == null) {
// No region state column data in hbase:meta table! Are I doing a rolling upgrade from // No region state column data in hbase:meta table! Are I doing a rolling upgrade from
@ -1245,8 +1252,10 @@ public class AssignmentManager implements ServerListener {
// In any of these cases, state is empty. For now, presume OFFLINE but there are probably // In any of these cases, state is empty. For now, presume OFFLINE but there are probably
// cases where we need to probe more to be sure this correct; TODO informed by experience. // cases where we need to probe more to be sure this correct; TODO informed by experience.
LOG.info(regionInfo.getEncodedName() + " regionState=null; presuming " + State.OFFLINE); LOG.info(regionInfo.getEncodedName() + " regionState=null; presuming " + State.OFFLINE);
localState = State.OFFLINE; localState = State.OFFLINE;
} }
final RegionStateNode regionNode = regionStates.getOrCreateRegionStateNode(regionInfo);
synchronized (regionNode) { synchronized (regionNode) {
if (!regionNode.isInTransition()) { if (!regionNode.isInTransition()) {
regionNode.setState(localState); regionNode.setState(localState);

4
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java
View File

@ -68,7 +68,7 @@ public class RegionStateStore {
} }
public interface RegionStateVisitor { public interface RegionStateVisitor {
void visitRegionState(RegionInfo regionInfo, State state, void visitRegionState(Result result, RegionInfo regionInfo, State state,
ServerName regionLocation, ServerName lastHost, long openSeqNum); ServerName regionLocation, ServerName lastHost, long openSeqNum);
} }
@ -121,7 +121,7 @@ public class RegionStateStore {
// TODO: move under trace, now is visible for debugging // TODO: move under trace, now is visible for debugging
LOG.info("Load hbase:meta entry region={}, regionState={}, lastHost={}, " + LOG.info("Load hbase:meta entry region={}, regionState={}, lastHost={}, " +
"regionLocation={}", regionInfo.getEncodedName(), state, lastHost, regionLocation); "regionLocation={}", regionInfo.getEncodedName(), state, lastHost, regionLocation);
visitor.visitRegionState(regionInfo, state, regionLocation, lastHost, openSeqNum); visitor.visitRegionState(result, regionInfo, state, regionLocation, lastHost, openSeqNum);
} }
} }