HDFS-11883: [SPS] : Handle NPE in BlockStorageMovementTracker when dropSPSWork() called. Contributed by Surendra Singh Lilhore.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/506c1bd0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/506c1bd0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/506c1bd0 Branch: refs/heads/HDFS-10285 Commit: 506c1bd0fabf0948db26bccb09feda6f32876a9f Parents: 286b5ba Author: Uma Maheswara Rao G <uma.ganguma...@intel.com> Authored: Tue May 30 18:12:17 2017 -0700 Committer: Rakesh Radhakrishnan <rake...@apache.org> Committed: Sun Jul 15 20:18:14 2018 +0530 ---------------------------------------------------------------------- .../hdfs/server/datanode/BlockStorageMovementTracker.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/506c1bd0/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockStorageMovementTracker.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockStorageMovementTracker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockStorageMovementTracker.java index 99858bc..c7e952b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockStorageMovementTracker.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockStorageMovementTracker.java @@ -88,13 +88,17 @@ public class BlockStorageMovementTracker implements Runnable { long trackId = result.getTrackId(); List<Future<BlockMovementResult>> blocksMoving = moverTaskFutures .get(trackId); + if (blocksMoving == null) { + LOG.warn("Future task doesn't exist for trackId " + trackId); + continue; + } blocksMoving.remove(future); List<BlockMovementResult> resultPerTrackIdList = addMovementResultToTrackIdList(result); // Completed all the scheduled blocks movement under this 'trackId'. - if (blocksMoving.isEmpty()) { + if (blocksMoving.isEmpty() || moverTaskFutures.get(trackId) == null) { synchronized (moverTaskFutures) { moverTaskFutures.remove(trackId); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
