Browse Source

HDFS-7066. LazyWriter#evictBlocks misses a null check for replicaState. (Contributed by Xiaoyu Yao)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
arp 11 years ago
parent
commit
6906eccec4

+ 4 - 0
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java

@@ -2410,6 +2410,10 @@ class FsDatasetImpl implements FsDatasetSpi<FsVolumeImpl> {
         LazyWriteReplicaTracker.ReplicaState replicaState =
             lazyWriteReplicaTracker.getNextCandidateForEviction();
 
+        if (replicaState == null) {
+          break;
+        }
+
         if (LOG.isDebugEnabled()) {
           LOG.debug("Evicting block " + replicaState);
         }