Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-8173. NPE thrown at DataNode shutdown when HTTP server was not able to create (Contributed by surendra singh lilhore) 

(cherry picked from commit c17cd4f7c1)
This commit is contained in:
Vinayakumar B 2015-04-20 14:58:04 +05:30
parent 5d3a4d51bd
commit c562e1b19b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -208,6 +208,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8043. NPE in MiniDFSCluster teardown. (Brahma Reddy Battula via ozawa) 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 Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
View File

@ -1728,11 +1728,13 @@ public class DataNode extends ReconfigurableBase
LOG.warn("Exception shutting down DataNode", e); LOG.warn("Exception shutting down DataNode", e);
} }
} }
if (httpServer != null) {
try { try {
httpServer.close(); httpServer.close();
} catch (Exception e) { } catch (Exception e) {
LOG.warn("Exception shutting down DataNode HttpServer", e); LOG.warn("Exception shutting down DataNode HttpServer", e);
} }
}
if (pauseMonitor != null) { if (pauseMonitor != null) {
pauseMonitor.stop(); pauseMonitor.stop();