From f7b0a530b6b1cf7cc21769b2adca00809c9d3c01 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Fri, 27 Apr 2018 18:08:12 +0800 Subject: [PATCH] HBASE-20476 Open sequence number could go backwards in AssignProcedure --- .../hadoop/hbase/master/assignment/AssignProcedure.java | 11 ++++++----- .../hadoop/hbase/master/replication/ModifyPeerProcedure.java | 3 +-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java index 0ece343..4c5ab78 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java @@ -285,12 +285,13 @@ public class AssignProcedure extends RegionTransitionProcedure { if (openSeqNum < regionNode.getOpenSeqNum()) { LOG.warn("Skipping update of open seqnum with " + openSeqNum + " because current seqnum=" + regionNode.getOpenSeqNum()); + } else { + regionNode.setOpenSeqNum(openSeqNum); + // Leave the state here as OPENING for now. We set it to OPEN in + // REGION_TRANSITION_FINISH section where we do a bunch of checks. + // regionNode.setState(RegionState.State.OPEN, RegionState.State.OPENING); + setTransitionState(RegionTransitionState.REGION_TRANSITION_FINISH); } - regionNode.setOpenSeqNum(openSeqNum); - // Leave the state here as OPENING for now. We set it to OPEN in - // REGION_TRANSITION_FINISH section where we do a bunch of checks. - // regionNode.setState(RegionState.State.OPEN, RegionState.State.OPENING); - setTransitionState(RegionTransitionState.REGION_TRANSITION_FINISH); break; case FAILED_OPEN: handleFailure(env, regionNode); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ModifyPeerProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ModifyPeerProcedure.java index 3bb61c5..ea2e314 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ModifyPeerProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ModifyPeerProcedure.java @@ -235,8 +235,7 @@ public abstract class ModifyPeerProcedure extends AbstractPeerProcedure name2Barrier : MetaTableAccessor .getTableEncodedRegionNameAndLastBarrier(conn, tableName)) { - // XXX: for debug only, change to trace after find out the real issues - LOG.debug("Update last pushed sequence id for {}, {}", tableName, name2Barrier); + LOG.trace("Update last pushed sequence id for {}, {}", tableName, name2Barrier); addToMap(lastSeqIds, name2Barrier.getFirst(), name2Barrier.getSecond().longValue() - 1, queueStorage); } -- 2.7.4