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/03/15 02:53:45 UTC
hbase git commit: HBASE-20146 Addendum Regions are stuck while
opening when WAL is disabled
Repository: hbase
Updated Branches:
refs/heads/master ddcf02ee2 -> 82483fad7
HBASE-20146 Addendum Regions are stuck while opening when WAL is disabled
Signed-off-by: zhangduo <zh...@apache.org>
Signed-off-by: Chia-Ping Tsai <ch...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/82483fad
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/82483fad
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/82483fad
Branch: refs/heads/master
Commit: 82483fad7c8374c814f63a0786b5a607c1ab1824
Parents: ddcf02e
Author: Ashish Singhi <as...@apache.org>
Authored: Tue Mar 13 15:31:39 2018 +0530
Committer: zhangduo <zh...@apache.org>
Committed: Thu Mar 15 10:13:30 2018 +0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/wal/DisabledWALProvider.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/82483fad/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/DisabledWALProvider.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/DisabledWALProvider.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/DisabledWALProvider.java
index f858054..75439fe 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/DisabledWALProvider.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/DisabledWALProvider.java
@@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.PrivateCellUtil;
import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl.WriteEntry;
import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;
import org.apache.hadoop.hbase.regionserver.wal.WALCoprocessorHost;
import org.apache.hadoop.hbase.util.FSUtils;
@@ -162,7 +163,13 @@ class DisabledWALProvider implements WALProvider {
@Override
public long append(RegionInfo info, WALKeyImpl key, WALEdit edits, boolean inMemstore)
throws IOException {
- key.setWriteEntry(key.getMvcc().begin());
+ WriteEntry writeEntry = key.getMvcc().begin();
+ if (!edits.isReplay()) {
+ for (Cell cell : edits.getCells()) {
+ PrivateCellUtil.setSequenceId(cell, writeEntry.getWriteNumber());
+ }
+ }
+ key.setWriteEntry(writeEntry);
if (!this.listeners.isEmpty()) {
final long start = System.nanoTime();
long len = 0;