From 1d56325a80cdac5820079ac04fa18a7e5126f8ef Mon Sep 17 00:00:00 2001 From: Jing Zhao Date: Wed, 2 Sep 2015 15:19:04 -0700 Subject: [PATCH] HDFS-9003. ForkJoin thread pool leaks. Contributed by Kihwal Lee. (cherry picked from commit de928d566a119f0b7fa5f171719642cd86be0af7) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/hdfs/server/namenode/FSImage.java | 1 + 2 files changed, 3 insertions(+) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 4a98e92eeda..def33d3c631 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -935,6 +935,8 @@ Release 2.8.0 - UNRELEASED HDFS-8388. Time and Date format need to be in sync in NameNode UI page. (Surendra Singh Lilhore via aajisaka) + HDFS-9003. ForkJoin thread pool leaks. (Kihwal Lee via jing9) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java index a7fa936d2f7..a8c2ecf6bea 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java @@ -884,6 +884,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); }