HDFS-2948. NN throws NPE during shutdown if it fails to startup. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1244186 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2012-02-14 19:38:02 +00:00
parent a0e4ae55f2
commit 439490f915
2 changed files with 5 additions and 1 deletions

View File

@ -200,3 +200,5 @@ HDFS-2939. TestHAStateTransitions fails on Windows. (Uma Maheswara Rao G via atm
HDFS-2947. On startup NN throws an NPE in the metrics system. (atm) HDFS-2947. On startup NN throws an NPE in the metrics system. (atm)
HDFS-2942. TestActiveStandbyElectorRealZK fails if build dir does not exist. (atm) HDFS-2942. TestActiveStandbyElectorRealZK fails if build dir does not exist. (atm)
HDFS-2948. NN throws NPE during shutdown if it fails to startup (todd)

View File

@ -974,7 +974,9 @@ public class NameNode {
@Override @Override
public void stopActiveServices() throws IOException { public void stopActiveServices() throws IOException {
if (namesystem != null) {
namesystem.stopActiveServices(); namesystem.stopActiveServices();
}
stopTrashEmptier(); stopTrashEmptier();
} }