Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-15425 Failing to write bulk load event marker in the WAL is ignored (Ashish Singhi)

This commit is contained in:
tedyu 2016-03-09 18:49:41 -08:00
parent 97cce850fe
commit d14b6c3810
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -5297,6 +5297,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
Preconditions.checkNotNull(familyPaths); Preconditions.checkNotNull(familyPaths);
// we need writeLock for multi-family bulk load // we need writeLock for multi-family bulk load
startBulkRegionOperation(hasMultipleColumnFamilies(familyPaths)); startBulkRegionOperation(hasMultipleColumnFamilies(familyPaths));
boolean isSuccessful = false;
try { try {
this.writeRequestsCount.increment(); this.writeRequestsCount.increment();
@ -5344,7 +5345,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
// problem when validating // problem when validating
LOG.warn("There was a recoverable bulk load failure likely due to a" + LOG.warn("There was a recoverable bulk load failure likely due to a" +
" split. These (family, HFile) pairs were not loaded: " + list); " split. These (family, HFile) pairs were not loaded: " + list);
return false; return isSuccessful;
} }
// We need to assign a sequential ID that's in between two memstores in order to preserve // We need to assign a sequential ID that's in between two memstores in order to preserve
@ -5404,10 +5405,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
} }
} }
return true; isSuccessful = true;
} finally { } finally {
if (wal != null && !storeFiles.isEmpty()) { if (wal != null && !storeFiles.isEmpty()) {
// @rite a bulk load event when not all hfiles are loaded // Write a bulk load event for hfiles that are loaded
try { try {
WALProtos.BulkLoadDescriptor loadDescriptor = ProtobufUtil.toBulkLoadDescriptor( WALProtos.BulkLoadDescriptor loadDescriptor = ProtobufUtil.toBulkLoadDescriptor(
this.getRegionInfo().getTable(), this.getRegionInfo().getTable(),
@ -5418,6 +5419,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
if (this.rsServices != null) { if (this.rsServices != null) {
// Have to abort region server because some hfiles has been loaded but we can't write // Have to abort region server because some hfiles has been loaded but we can't write
// the event into WAL // the event into WAL
isSuccessful = false;
this.rsServices.abort("Failed to write bulk load event into WAL.", ioe); this.rsServices.abort("Failed to write bulk load event into WAL.", ioe);
} }
} }
@ -5425,6 +5427,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
closeBulkRegionOperation(); closeBulkRegionOperation();
} }
return isSuccessful;
} }
@Override @Override