HDDS-449. Add a NULL check to protect DeadNodeHandler#onMessage. Contributed by LiXin Ge.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a65c3ea9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a65c3ea9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a65c3ea9 Branch: refs/heads/HADOOP-15407 Commit: a65c3ea91cad7e8b453976bab2165ea4a3c6daf9 Parents: 985f3bf Author: Márton Elek <e...@apache.org> Authored: Sat Sep 15 13:35:00 2018 +0200 Committer: Márton Elek <e...@apache.org> Committed: Sat Sep 15 13:35:21 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a65c3ea9/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java index d694a10..7fda67d 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DeadNodeHandler.java @@ -57,6 +57,11 @@ public class DeadNodeHandler implements EventHandler<DatanodeDetails> { EventPublisher publisher) { Set<ContainerID> containers = node2ContainerMap.getContainers(datanodeDetails.getUuid()); + if (containers == null) { + LOG.info("There's no containers in dead datanode {}, no replica will be" + + " removed from the in-memory state.", datanodeDetails.getUuid()); + return; + } LOG.info( "Datanode {} is dead. Removing replications from the in-memory state.", datanodeDetails.getUuid()); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
