Repository: hadoop Updated Branches: refs/heads/branch-2 e1943e447 -> 1d56325a8
HDFS-9003. ForkJoin thread pool leaks. Contributed by Kihwal Lee. (cherry picked from commit de928d566a119f0b7fa5f171719642cd86be0af7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1d56325a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1d56325a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1d56325a Branch: refs/heads/branch-2 Commit: 1d56325a80cdac5820079ac04fa18a7e5126f8ef Parents: e1943e4 Author: Jing Zhao <[email protected]> Authored: Wed Sep 2 15:19:04 2015 -0700 Committer: Jing Zhao <[email protected]> Committed: Wed Sep 2 15:19:29 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java | 1 + 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d56325a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 4a98e92..def33d3 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d56325a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java ---------------------------------------------------------------------- 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 a7fa936..a8c2ecf 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); }
