Skip to content

PARQUET-431: Make ParquetOutputFormat.memoryManager volatile #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lw-lin wants to merge 5 commits into from
Closed

PARQUET-431: Make ParquetOutputFormat.memoryManager volatile #313

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
615aa5a
PARQUET-431
lw-lin Jan 17, 2016
fd1df4e
Adds synchronization around the creation of memoryManager as well as …
lw-lin Feb 2, 2016
d54bb99
Undo the Deprecated anotation
lw-lin Feb 2, 2016
5e94fa3
Remove the volatile modifier for memoryManager
lw-lin Feb 3, 2016
1aa4a44
empty commit to trigger CI
lw-lin Feb 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,12 @@ public RecordWriter<Void, T> getRecordWriter(Configuration conf, Path file, Comp
MemoryManager.DEFAULT_MEMORY_POOL_RATIO);
long minAllocation = conf.getLong(ParquetOutputFormat.MIN_MEMORY_ALLOCATION,
MemoryManager.DEFAULT_MIN_MEMORY_ALLOCATION);
if (memoryManager == null) {
memoryManager = new MemoryManager(maxLoad, minAllocation);
} else if (memoryManager.getMemoryPoolRatio() != maxLoad) {
synchronized (ParquetOutputFormat.class) {
if (memoryManager == null) {
memoryManager = new MemoryManager(maxLoad, minAllocation);
}
}
if (memoryManager.getMemoryPoolRatio() != maxLoad) {
LOG.warn("The configuration " + MEMORY_POOL_RATIO + " has been set. It should not " +
"be reset by the new value: " + maxLoad);
}
Expand Down Expand Up @@ -441,13 +444,12 @@ public OutputCommitter getOutputCommitter(TaskAttemptContext context)
return committer;
}


/**
* This memory manager is for all the real writers (InternalParquetRecordWriter) in one task.
*/
private static MemoryManager memoryManager;

public static MemoryManager getMemoryManager() {
public synchronized static MemoryManager getMemoryManager() {
return memoryManager;
}
}