Repository: hbase Updated Branches: refs/heads/branch-1.3 63655b549 -> c6ab36ede
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/c6ab36ed Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c6ab36ed Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c6ab36ed Branch: refs/heads/branch-1.3 Commit: c6ab36edeb67a3beba6ded84026e039777e6717e Parents: 63655b5 Author: Ashish Singhi <[email protected]> Authored: Tue Mar 13 15:31:39 2018 +0530 Committer: zhangduo <[email protected]> Committed: Thu Mar 15 10:18:21 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/c6ab36ed/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 a8756b3..62df2c7 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 @@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.classification.InterfaceAudience; // imports for things that haven't moved from regionserver.wal yet. +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.regionserver.wal.WALEdit; @@ -154,7 +155,13 @@ class DisabledWALProvider implements WALProvider { @Override public long append(HTableDescriptor htd, HRegionInfo info, WALKey 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()) { + CellUtil.setSequenceId(cell, writeEntry.getWriteNumber()); + } + } + key.setWriteEntry(writeEntry); if (!this.listeners.isEmpty()) { final long start = System.nanoTime(); long len = 0;
