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

HDFS-11883: [SPS] : Handle NPE in BlockStorageMovementTracker when dropSPSWork() called. Contributed by Surendra Singh Lilhore.

Browse Source
This commit is contained in:
Uma Maheswara Rao G 2017-05-30 18:12:17 -07:00 committed by Uma Maheswara Rao Gangumalla
parent 5ce332dc9a
commit e53f89ccc3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockStorageMovementTracker.java
View File

@ -88,13 +88,17 @@ public void run() {
long trackId = result.getTrackId(); long trackId = result.getTrackId();
List<Future<BlockMovementResult>> blocksMoving = moverTaskFutures List<Future<BlockMovementResult>> blocksMoving = moverTaskFutures
.get(trackId); .get(trackId);
if (blocksMoving == null) {
LOG.warn("Future task doesn't exist for trackId " + trackId);
continue;
}
blocksMoving.remove(future); blocksMoving.remove(future);
List<BlockMovementResult> resultPerTrackIdList = List<BlockMovementResult> resultPerTrackIdList =
addMovementResultToTrackIdList(result); addMovementResultToTrackIdList(result);
// Completed all the scheduled blocks movement under this 'trackId'. // Completed all the scheduled blocks movement under this 'trackId'.
if (blocksMoving.isEmpty()) { if (blocksMoving.isEmpty() || moverTaskFutures.get(trackId) == null) {
synchronized (moverTaskFutures) { synchronized (moverTaskFutures) {
moverTaskFutures.remove(trackId); moverTaskFutures.remove(trackId);
} }