Repository: hadoop Updated Branches: refs/heads/branch-2 37ad3b3fe -> 1a2e6e809
MAPREDUCE-6387. Serialize the recently added Task#encryptedSpillKey field at the end. (Arun Suresh via kasha) (cherry picked from commit 6786daab33792c9c426adf0fc6b361f193d356a8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1a2e6e80 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1a2e6e80 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1a2e6e80 Branch: refs/heads/branch-2 Commit: 1a2e6e8091d8578950a8623a023422ba5ee87d53 Parents: 37ad3b3 Author: Karthik Kambatla <[email protected]> Authored: Fri Jun 5 09:14:06 2015 -0700 Committer: Karthik Kambatla <[email protected]> Committed: Fri Jun 5 09:17:34 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/mapred/Task.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a2e6e80/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 30a2666..565ace4 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -238,6 +238,9 @@ Release 2.7.1 - UNRELEASED copySucceeded() in one thread and copyFailed() in another thread on the 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 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a2e6e80/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java index b20aff7..5031368 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Task.java @@ -513,8 +513,8 @@ abstract public class Task implements Writable, Configurable { out.writeBoolean(taskCleanup); Text.writeString(out, user); out.writeInt(encryptedSpillKey.length); - out.write(encryptedSpillKey); extraData.write(out); + out.write(encryptedSpillKey); } public void readFields(DataInput in) throws IOException { @@ -541,8 +541,8 @@ abstract public class Task implements Writable, Configurable { user = StringInterner.weakIntern(Text.readString(in)); int len = in.readInt(); encryptedSpillKey = new byte[len]; - in.readFully(encryptedSpillKey); extraData.readFields(in); + in.readFully(encryptedSpillKey); } @Override
