big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-8850. VolumeScanner thread exits with exception if there is no block pool to be scanned but there are suspicious blocks. (Colin Patrick McCabe via yliu)

Browse Source
This commit is contained in:
yliu 2015-08-04 15:54:23 +08:00
parent c3364ca8e7
commit 9a08999906
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -1109,6 +1109,10 @@ Release 2.8.0 - UNRELEASED
HDFS-8847. change TestHDFSContractAppend to not override HDFS-8847. change TestHDFSContractAppend to not override
testRenameFileBeingAppended method. (Zhihai Xu) testRenameFileBeingAppended method. (Zhihai Xu)
HDFS-8850. VolumeScanner thread exits with exception if there is no block
pool to be scanned but there are suspicious blocks. (Colin Patrick McCabe
via yliu)
Release 2.7.2 - UNRELEASED Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/VolumeScanner.java
View File

@ -536,12 +536,14 @@ private long runLoop(ExtendedBlock suspectBlock) {
return 0; return 0;
} }
} }
if (curBlockIter != null) {
long saveDelta = monotonicMs - curBlockIter.getLastSavedMs(); long saveDelta = monotonicMs - curBlockIter.getLastSavedMs();
if (saveDelta >= conf.cursorSaveMs) { if (saveDelta >= conf.cursorSaveMs) {
LOG.debug("{}: saving block iterator {} after {} ms.", LOG.debug("{}: saving block iterator {} after {} ms.",
this, curBlockIter, saveDelta); this, curBlockIter, saveDelta);
saveBlockIterator(curBlockIter); saveBlockIterator(curBlockIter);
} }
}
bytesScanned = scanBlock(block, conf.targetBytesPerSec); bytesScanned = scanBlock(block, conf.targetBytesPerSec);
if (bytesScanned >= 0) { if (bytesScanned >= 0) {
scannedBytesSum += bytesScanned; scannedBytesSum += bytesScanned;