You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/05/02 02:59:02 UTC
[12/43] hbase git commit: HBASE-20476 Open sequence number could go
backwards in AssignProcedure
HBASE-20476 Open sequence number could go backwards in AssignProcedure
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4be96dd8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4be96dd8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4be96dd8
Branch: refs/heads/HBASE-19064
Commit: 4be96dd8a61bedc15021740157682605b6445265
Parents: 650340a
Author: zhangduo <zh...@apache.org>
Authored: Fri Apr 27 21:32:03 2018 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Sat Apr 28 06:49:50 2018 +0800
----------------------------------------------------------------------
.../apache/hadoop/hbase/master/assignment/AssignProcedure.java | 3 ++-
.../hadoop/hbase/master/replication/ModifyPeerProcedure.java | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4be96dd8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignProcedure.java
----------------------------------------------------------------------
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..362b116 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,8 +285,9 @@ 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);
}
- 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);
http://git-wip-us.apache.org/repos/asf/hbase/blob/4be96dd8/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ModifyPeerProcedure.java
----------------------------------------------------------------------
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<PeerModi
}
for (Pair<String, Long> 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);
}