From 111380b64782703381b2b852c6425abe0bc9d21a Mon Sep 17 00:00:00 2001 From: tedyu Date: Wed, 25 Oct 2017 06:28:24 -0700 Subject: [PATCH] HBASE-19065 HRegion#bulkLoadHFiles() should wait for concurrent Region#flush() to finish - revert, waiting for alpha4 to come out --- .../java/org/apache/hadoop/hbase/regionserver/HRegion.java | 4 ---- 1 file changed, 4 deletions(-) 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 f0c9ec28f53..c90a702175f 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);