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

HDFS-2553. Fix BlockPoolSliceScanner spinning in a tight loop. Contributed by Uma Maheswara Rao G. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1220317 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2011-12-18 01:13:00 +00:00
parent fa1edc9a1e
commit a89baed833
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,6 +275,9 @@ Release 0.23.1 - UNRELEASED
HDFS-2640. Javadoc generation hangs. (tomwhite) HDFS-2640. Javadoc generation hangs. (tomwhite)
HDFS-2553. Fix BlockPoolSliceScanner spinning in a tight loop (Uma
Maheswara Rao G via todd)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

10
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceScanner.java
View File

@ -450,14 +450,14 @@ class BlockPoolSliceScanner {
} }
private synchronized long getEarliestScanTime() { private synchronized long getEarliestScanTime() {
if ( blockInfoSet.size() > 0 ) { if (!blockInfoSet.isEmpty()) {
return blockInfoSet.first().lastScanTime; return blockInfoSet.first().lastScanTime;
} }
return Long.MAX_VALUE; return Long.MAX_VALUE;
} }
private synchronized boolean isFirstBlockProcessed() { private synchronized boolean isFirstBlockProcessed() {
if (blockInfoSet.size() > 0 ) { if (!blockInfoSet.isEmpty()) {
long blockId = blockInfoSet.first().block.getBlockId(); long blockId = blockInfoSet.first().block.getBlockId();
if ((processedBlocks.get(blockId) != null) if ((processedBlocks.get(blockId) != null)
&& (processedBlocks.get(blockId) == 1)) { && (processedBlocks.get(blockId) == 1)) {
@ -471,7 +471,7 @@ class BlockPoolSliceScanner {
private void verifyFirstBlock() { private void verifyFirstBlock() {
Block block = null; Block block = null;
synchronized (this) { synchronized (this) {
if ( blockInfoSet.size() > 0 ) { if (!blockInfoSet.isEmpty()) {
block = blockInfoSet.first().block; block = blockInfoSet.first().block;
} }
} }
@ -560,7 +560,7 @@ class BlockPoolSliceScanner {
* lastModificationTime > 0. * lastModificationTime > 0.
*/ */
synchronized (this) { synchronized (this) {
if (blockInfoSet.size() > 0 ) { if (!blockInfoSet.isEmpty()) {
BlockScanInfo info; BlockScanInfo info;
while ((info = blockInfoSet.first()).lastScanTime < 0) { while ((info = blockInfoSet.first()).lastScanTime < 0) {
delBlockInfo(info); delBlockInfo(info);
@ -630,7 +630,7 @@ class BlockPoolSliceScanner {
} }
} }
if (((now - getEarliestScanTime()) >= scanPeriod) if (((now - getEarliestScanTime()) >= scanPeriod)
|| (!(this.isFirstBlockProcessed()))) { || ((!blockInfoSet.isEmpty()) && !(this.isFirstBlockProcessed()))) {
verifyFirstBlock(); verifyFirstBlock();
} else { } else {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {