Repository: hadoop Updated Branches: refs/heads/trunk 00bebb7e5 -> 9a09200a1
HADOOP-12958. PhantomReference for filesystem statistics can trigger OOM. Contributed by Sangjin Lee Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9a09200a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9a09200a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9a09200a Branch: refs/heads/trunk Commit: 9a09200a1f5f752e266d4fb8e0c808073080bde8 Parents: 00bebb7 Author: Jason Lowe <jl...@apache.org> Authored: Fri Mar 25 22:56:49 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Fri Mar 25 22:58:04 2016 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/FileSystem.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a09200a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java index a8a5c6d..e0ea7ac 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java @@ -20,7 +20,7 @@ package org.apache.hadoop.fs; import java.io.Closeable; import java.io.FileNotFoundException; import java.io.IOException; -import java.lang.ref.PhantomReference; +import java.lang.ref.WeakReference; import java.lang.ref.ReferenceQueue; import java.net.URI; import java.net.URISyntaxException; @@ -3133,7 +3133,7 @@ public abstract class FileSystem extends Configured implements Closeable { /** * Set of all thread-local data areas. Protected by the Statistics lock. - * The references to the statistics data are kept using phantom references + * The references to the statistics data are kept using weak references * to the associated threads. Proper clean-up is performed by the cleaner * thread when the threads are garbage collected. */ @@ -3186,11 +3186,11 @@ public abstract class FileSystem extends Configured implements Closeable { } /** - * A phantom reference to a thread that also includes the data associated + * A weak reference to a thread that also includes the data associated * with that thread. On the thread being garbage collected, it is enqueued * to the reference queue for clean-up. */ - private class StatisticsDataReference extends PhantomReference<Thread> { + private class StatisticsDataReference extends WeakReference<Thread> { private final StatisticsData data; public StatisticsDataReference(StatisticsData data, Thread thread) {
