big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-6261. NullPointerException if MapOutputBuffer.flush invoked twice. Contributed by Tsuyoshi OZAWA

Browse Source
This commit is contained in:
Jason Lowe 2015-02-18 19:28:02 +00:00
parent 1714609919
commit 4981d082d4
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,6 +379,9 @@ Release 2.7.0 - UNRELEASED
MAPREDUCE-4286. TestClientProtocolProviderImpls passes on failure MAPREDUCE-4286. TestClientProtocolProviderImpls passes on failure
conditions. (Devaraj K via ozawa) conditions. (Devaraj K via ozawa)
MAPREDUCE-6261. NullPointerException if MapOutputBuffer.flush invoked
twice (Tsuyoshi OZAWA via jlowe)
Release 2.6.1 - UNRELEASED Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java
View File

@ -1458,6 +1458,10 @@ public void write(byte b[], int off, int len)
public void flush() throws IOException, ClassNotFoundException, public void flush() throws IOException, ClassNotFoundException,
InterruptedException { InterruptedException {
LOG.info("Starting flush of map output"); LOG.info("Starting flush of map output");
if (kvbuffer == null) {
LOG.info("kvbuffer is null. Skipping flush.");
return;
}
spillLock.lock(); spillLock.lock();
try { try {
while (spillInProgress) { while (spillInProgress) {