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

MAPREDUCE-6075. HistoryServerFileSystemStateStore can create zero-length files. Contributed by Jason Lowe 

(cherry picked from commit 17a025d9dda9949f191b650e3ef96090880f568a)
This commit is contained in:
Jason Lowe 2014-09-10 22:10:36 +00:00
parent 88e5549d90
commit e6f108c99b
2 changed files with 9 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

@ -124,6 +124,9 @@ Release 2.6.0 - UNRELEASED
MAPREDUCE-6071. JobImpl#makeUberDecision doesn't log that Uber mode is MAPREDUCE-6071. JobImpl#makeUberDecision doesn't log that Uber mode is
disabled because of too much CPUs (Tsuyoshi OZAWA via jlowe) disabled because of too much CPUs (Tsuyoshi OZAWA via jlowe)
MAPREDUCE-6075. HistoryServerFileSystemStateStore can create zero-length
files (jlowe)
Release 2.5.1 - UNRELEASED Release 2.5.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/HistoryServerFileSystemStateStoreService.java
View File

@ -189,6 +189,8 @@ public class HistoryServerFileSystemStateStoreService
DataOutputStream dataStream = new DataOutputStream(memStream); DataOutputStream dataStream = new DataOutputStream(memStream);
try { try {
key.write(dataStream); key.write(dataStream);
dataStream.close();
dataStream = null;
} finally { } finally {
IOUtils.cleanup(LOG, dataStream); IOUtils.cleanup(LOG, dataStream);
} }
@ -260,6 +262,8 @@ public class HistoryServerFileSystemStateStoreService
try { try {
try { try {
out.write(data); out.write(data);
out.close();
out = null;
} finally { } finally {
IOUtils.cleanup(LOG, out); IOUtils.cleanup(LOG, out);
} }
@ -299,6 +303,8 @@ public class HistoryServerFileSystemStateStoreService
try { try {
tokenId.write(dataStream); tokenId.write(dataStream);
dataStream.writeLong(renewDate); dataStream.writeLong(renewDate);
dataStream.close();
dataStream = null;
} finally { } finally {
IOUtils.cleanup(LOG, dataStream); IOUtils.cleanup(LOG, dataStream);
} }