Repository: hbase Updated Branches: refs/heads/branch-2 ca79a9156 -> 111380b64
HBASE-19065 HRegion#bulkLoadHFiles() should wait for concurrent Region#flush() to finish - revert, waiting for alpha4 to come out Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/111380b6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/111380b6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/111380b6 Branch: refs/heads/branch-2 Commit: 111380b64782703381b2b852c6425abe0bc9d21a Parents: ca79a91 Author: tedyu <[email protected]> Authored: Wed Oct 25 06:28:24 2017 -0700 Committer: tedyu <[email protected]> Committed: Wed Oct 25 06:28:24 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/111380b6/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 f0c9ec2..c90a702 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 @@ -5710,10 +5710,6 @@ 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);
