HDFS-6018. Merge change r1572183 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572184 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jing Zhao 2014-02-26 18:23:42 +00:00
parent af95bdd1ca
commit abdb0ef402
2 changed files with 3 additions and 1 deletions

View File

@ -106,6 +106,9 @@ Release 2.4.0 - UNRELEASED
HDFS-6006. Remove duplicate code in FSNameSystem#getFileInfo. HDFS-6006. Remove duplicate code in FSNameSystem#getFileInfo.
(Akira Ajisaka via cnauroth) (Akira Ajisaka via cnauroth)
HDFS-6018. Exception recorded in LOG when IPCLoggerChannel#close is called.
(jing9)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-5790. LeaseManager.findPath is very slow when many leases need recovery HDFS-5790. LeaseManager.findPath is very slow when many leases need recovery

View File

@ -181,7 +181,6 @@ public class IPCLoggerChannel implements AsyncLogger {
@Override @Override
public void close() { public void close() {
QuorumJournalManager.LOG.info("Closing", new Exception());
// No more tasks may be submitted after this point. // No more tasks may be submitted after this point.
executor.shutdown(); executor.shutdown();
if (proxy != null) { if (proxy != null) {