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

MAPREDUCE-6387. Serialize the recently added Task#encryptedSpillKey field at the end. (Arun Suresh via kasha) 

(cherry picked from commit 6786daab33)
This commit is contained in:
Karthik Kambatla 2015-06-05 09:14:06 -07:00
parent 37ad3b3fef
commit 1a2e6e8091
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,6 +238,9 @@ Release 2.7.1 - UNRELEASED
copySucceeded() in one thread and copyFailed() in another thread on the copySucceeded() in one thread and copyFailed() in another thread on the
same host. (Junping Du via ozawa) same host. (Junping Du via ozawa)
MAPREDUCE-6387. Serialize the recently added Task#encryptedSpillKey field at
the end. (Arun Suresh via kasha)
Release 2.7.0 - 2015-04-20 Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -513,8 +513,8 @@ public void write(DataOutput out) throws IOException {
out.writeBoolean(taskCleanup); out.writeBoolean(taskCleanup);
Text.writeString(out, user); Text.writeString(out, user);
out.writeInt(encryptedSpillKey.length); out.writeInt(encryptedSpillKey.length);
out.write(encryptedSpillKey);
extraData.write(out); extraData.write(out);
out.write(encryptedSpillKey);
} }
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
@ -541,8 +541,8 @@ public void readFields(DataInput in) throws IOException {
user = StringInterner.weakIntern(Text.readString(in)); user = StringInterner.weakIntern(Text.readString(in));
int len = in.readInt(); int len = in.readInt();
encryptedSpillKey = new byte[len]; encryptedSpillKey = new byte[len];
in.readFully(encryptedSpillKey);
extraData.readFields(in); extraData.readFields(in);
in.readFully(encryptedSpillKey);
} }
@Override @Override