You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/12/06 22:29:47 UTC
[2/6] hbase git commit: HBASE-19442 Backport HBASE-19065 to branch-1
(HRegion#bulkLoadHFiles() should wait for concurrent Region#flush() to
finish).
HBASE-19442 Backport HBASE-19065 to branch-1 (HRegion#bulkLoadHFiles() should wait for concurrent Region#flush() to finish).
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a1e77f60
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a1e77f60
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a1e77f60
Branch: refs/heads/branch-1.2
Commit: a1e77f6056ea184050a22e92d82b171af03f9128
Parents: 199c0e6
Author: Pankaj Kumar <pa...@huawei.com>
Authored: Thu Dec 7 01:59:20 2017 +0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Dec 6 14:15:08 2017 -0800
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a1e77f60/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 696f8c3..a19b3e8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -5469,6 +5469,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
seqId = ((FlushResultImpl)fs).flushSequenceId;
} else if (fs.getResult() == FlushResult.Result.CANNOT_FLUSH_MEMSTORE_EMPTY) {
seqId = ((FlushResultImpl)fs).flushSequenceId;
+ } else if (fs.getResult() == FlushResult.Result.CANNOT_FLUSH) {
+ // CANNOT_FLUSH may mean that a flush is already on-going
+ // we need to wait for that flush to complete
+ waitForFlushes();
} else {
throw new IOException("Could not bulk load with an assigned sequential ID because the "+
"flush didn't run. Reason for not flushing: " + ((FlushResultImpl)fs).failureReason);