Browse Source

HDFS-9003. ForkJoin thread pool leaks. Contributed by Kihwal Lee.

(cherry picked from commit de928d566a119f0b7fa5f171719642cd86be0af7)
(cherry picked from commit 1d56325a80cdac5820079ac04fa18a7e5126f8ef)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Jing Zhao 9 years ago
parent
commit
171a0bd517

+ 2 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -37,6 +37,8 @@ Release 2.7.5 - UNRELEASED
 
     HDFS-8865. Improve quota initialization performance. Contributed by Kihwal Lee.
 
+    HDFS-9003. ForkJoin thread pool leaks. (Kihwal Lee via jing9)
+
 Release 2.7.4 - 2017-08-04
 
   INCOMPATIBLE CHANGES

+ 1 - 0
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java

@@ -935,6 +935,7 @@ public class FSImage implements Closeable {
         root, counts);
     p.execute(task);
     task.join();
+    p.shutdown();
     LOG.info("Quota initialization completed in " + (Time.now() - start) +
         " milliseconds\n" + counts);
   }