HDDS-1882. TestReplicationManager failed with NPE. (apache#1197)

amahussein · Oct 29, 2019 · cdcdb53 · cdcdb53
1 parent c37b17a
commit cdcdb53
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...dds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManager.java b/...dds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManager.java
@@ -486,8 +486,11 @@ private void handleUnderReplicatedContainer(final ContainerInfo container,
         final List<DatanodeDetails> excludeList = replicas.stream()
             .map(ContainerReplica::getDatanodeDetails)
             .collect(Collectors.toList());
-        inflightReplication.get(id).stream().map(r -> r.datanode)
-            .forEach(excludeList::add);
+        List<InflightAction> actionList = inflightReplication.get(id);
+        if (actionList != null) {
+          actionList.stream().map(r -> r.datanode)
+              .forEach(excludeList::add);
+        }
         final List<DatanodeDetails> selectedDatanodes = containerPlacement
             .chooseDatanodes(excludeList, null, delta,
                 container.getUsedBytes());