HDFS-8173. NPE thrown at DataNode shutdown when HTTP server was not able to create (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/233f1062 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/233f1062 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/233f1062 Branch: refs/heads/YARN-2928 Commit: 233f1062060e11e6a753281f388268bc034b7a9f Parents: 63d0082 Author: Vinayakumar B <vinayakum...@apache.org> Authored: Mon Apr 20 14:58:04 2015 +0530 Committer: Zhijie Shen <zjs...@apache.org> Committed: Tue Apr 21 16:16:54 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/datanode/DataNode.java | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/233f1062/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 9bb1fd4..8dec32e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -526,6 +526,9 @@ Release 2.8.0 - UNRELEASED HDFS-8043. NPE in MiniDFSCluster teardown. (Brahma Reddy Battula via ozawa) + HDFS-8173. NPE thrown at DataNode shutdown when HTTP server was not able to + create (surendra singh lilhore via vinayakumarb) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/233f1062/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java index 0ddb99c..e81da52 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -1721,10 +1721,12 @@ public class DataNode extends ReconfigurableBase LOG.warn("Exception shutting down DataNode", e); } } - try { - httpServer.close(); - } catch (Exception e) { - LOG.warn("Exception shutting down DataNode HttpServer", e); + if (httpServer != null) { + try { + httpServer.close(); + } catch (Exception e) { + LOG.warn("Exception shutting down DataNode HttpServer", e); + } } if (pauseMonitor != null) {
