Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12958. PhantomReference for filesystem statistics can trigger OOM. Contributed by Sangjin Lee 

(cherry picked from commit 9a09200a1f)
This commit is contained in:
Jason Lowe 2016-03-25 23:03:39 +00:00
parent a112c0138a
commit 02e81caa21
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -76,6 +76,9 @@ Release 2.7.3 - UNRELEASED
HADOOP-12688. Fix deadlinks in Compatibility.md. (Gabor Liptak via aajisaka)
HADOOP-12958. PhantomReference for filesystem statistics can trigger OOM
(Sangjin Lee via jlowe)
Release 2.7.2 - 2016-01-25
INCOMPATIBLE CHANGES

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
View File

@ -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;
@ -2950,7 +2950,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.
*/
@ -3003,11 +3003,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) {