Repository: hbase Updated Branches: refs/heads/branch-2.0 abdc7b25d -> 6874e1a7b
HBASE-20146 Addendum Regions are stuck while opening when WAL is disabled Signed-off-by: zhangduo <[email protected]> Signed-off-by: Chia-Ping Tsai <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6874e1a7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6874e1a7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6874e1a7 Branch: refs/heads/branch-2.0 Commit: 6874e1a7bcad0d70813013b60c4049d2d05c0ef5 Parents: abdc7b2 Author: Ashish Singhi <[email protected]> Authored: Tue Mar 13 15:31:39 2018 +0530 Committer: zhangduo <[email protected]> Committed: Thu Mar 15 10:14:04 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/6874e1a7/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;
