HBASE-19065 HRegion#bulkLoadHFiles() should wait for concurrent Region#flush() to finish - revert, waiting for alpha4 to come out
This commit is contained in:
parent
ca79a91566
commit
111380b647
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue