You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2015/08/27 01:27:53 UTC
hadoop git commit: HDFS-8896. DataNode object isn't GCed when
shutdown,
because it has GC root in ShutdownHookManager. Contributed by Walter Su.
Repository: hadoop
Updated Branches:
refs/heads/trunk c992bcf9c -> f44b59900
HDFS-8896. DataNode object isn't GCed when shutdown, because it has GC root in ShutdownHookManager. Contributed by Walter Su.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f44b5990
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f44b5990
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f44b5990
Branch: refs/heads/trunk
Commit: f44b599003bb79b1ec9b92e7546546523ec01676
Parents: c992bcf
Author: Jing Zhao <ji...@apache.org>
Authored: Wed Aug 26 16:26:18 2015 -0700
Committer: Jing Zhao <ji...@apache.org>
Committed: Wed Aug 26 16:27:34 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/util/ShutdownHookManager.java | 6 ++++++
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java | 2 ++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f44b5990/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
index 989c96a..85533db 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
@@ -187,4 +187,10 @@ public class ShutdownHookManager {
return shutdownInProgress.get();
}
+ /**
+ * clear all registered shutdownHooks.
+ */
+ public void clearShutdownHooks() {
+ hooks.clear();
+ }
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f44b5990/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 607de79..54c2d21 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -841,6 +841,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8951. Move the shortcircuit package to hdfs-client.
(Mingliang Liu via wheat9)
+ HDFS-8896. DataNode object isn't GCed when shutdown, because it has GC
+ root in ShutdownHookManager. (Walter Su via jing9)
+
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f44b5990/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 7052321..24e0965 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -119,6 +119,7 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authorize.ProxyUsers;
import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.util.ExitUtil;
+import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.ToolRunner;
@@ -1867,6 +1868,7 @@ public class MiniDFSCluster {
nameNode = null;
}
}
+ ShutdownHookManager.get().clearShutdownHooks();
if (base_dir != null) {
if (deleteDfsDir) {
base_dir.delete();