Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fdf0542d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fdf0542d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fdf0542d Branch: refs/heads/HDFS-6581 Commit: fdf0542d8e69ab1202a1655f318019f6ae972ec3 Parents: 9f22fb8 14e2639 Author: arp <[email protected]> Authored: Sun Sep 14 15:12:47 2014 -0700 Committer: arp <[email protected]> Committed: Sun Sep 14 15:12:47 2014 -0700 ---------------------------------------------------------------------- .../mapreduce/v2/app/ControlledClock.java | 43 ------- .../v2/app/job/impl/TestTaskAttempt.java | 3 +- .../v2/app/rm/TestRMContainerAllocator.java | 3 +- .../mapreduce/v2/hs/TestHistoryFileManager.java | 3 +- .../hadoop-mapreduce-client-jobclient/pom.xml | 6 + .../v2/TestSpeculativeExecutionWithMRApp.java | 3 +- hadoop-yarn-project/CHANGES.txt | 10 +- .../records/ApplicationSubmissionContext.java | 43 +++++++ .../src/main/proto/yarn_protos.proto | 1 + .../pb/ApplicationSubmissionContextPBImpl.java | 13 ++ .../hadoop/yarn/util/ControlledClock.java | 42 ++++++ .../timeline/webapp/CrossOriginFilter.java | 47 ++++--- .../timeline/webapp/TestCrossOriginFilter.java | 41 +++++- .../recovery/FileSystemRMStateStore.java | 1 + .../recovery/MemoryRMStateStore.java | 1 + .../resourcemanager/recovery/RMStateStore.java | 10 +- .../recovery/ZKRMStateStore.java | 2 + .../records/ApplicationAttemptStateData.java | 15 ++- .../pb/ApplicationAttemptStateDataPBImpl.java | 12 ++ .../server/resourcemanager/rmapp/RMAppImpl.java | 44 ++++++- .../rmapp/attempt/RMAppAttempt.java | 6 + .../rmapp/attempt/RMAppAttemptImpl.java | 27 +++- .../yarn_server_resourcemanager_recovery.proto | 1 + .../yarn/server/resourcemanager/MockRM.java | 23 +++- .../applicationsmanager/TestAMRestart.java | 127 +++++++++++++++++++ .../recovery/RMStateStoreTestBase.java | 6 +- 26 files changed, 433 insertions(+), 100 deletions(-) ----------------------------------------------------------------------
