HADOOP-3534 Merge -r 669528:669529 from trunk to branch 0.18.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@669530 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -628,6 +628,9 @@ Release 0.18.0 - Unreleased
     HADOOP-3580. Fixes a problem to do with specifying a har as an input to 
     a job. (Mahadev Konar via ddas)
 
+    HADOOP-3534. Log IOExceptions that happen in closing the name
+    system when the NameNode shuts down. (Tsz Wo (Nicholas) Sze via omalley)
+
 Release 0.17.1 - Unreleased
 
   INCOMPATIBLE CHANGES

src/hdfs/org/apache/hadoop/dfs/FSNamesystem.java

@@ -461,8 +461,10 @@ class FSNamesystem implements FSConstants, FSNamesystemMBean {
           lmthread.interrupt();
           lmthread.join(3000);
         }
+        dir.close();
       } catch (InterruptedException ie) {
-      } finally {
+      } catch (IOException ie) {
+        LOG.error("Error closing FSDirectory", ie);
         IOUtils.cleanup(LOG, dir);
       }
     }