Merge branch 'trunk' into HDFS-7240
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/ContainerExecutor.java
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/ContainerLaunch.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/75ce3fcc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/75ce3fcc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/75ce3fcc
Branch: refs/heads/HDFS-7240
Commit: 75ce3fcc766a66c63afd4912922f0991afbcd1d5
Parents: 579434a 453d48b
Author: Anu Engineer <[email protected]>
Authored: Tue Oct 3 09:25:36 2017 -0700
Committer: Anu Engineer <[email protected]>
Committed: Tue Oct 3 09:25:36 2017 -0700
----------------------------------------------------------------------
.../hadoop/fs/shell/TestCopyFromLocal.java | 15 +-
.../hadoop-hdfs/src/main/bin/start-dfs.sh | 2 +-
.../hadoop-hdfs/src/main/bin/stop-dfs.sh | 2 +-
.../server/namenode/FSDirErasureCodingOp.java | 3 +-
.../hdfs/server/namenode/FSDirXAttrOp.java | 4 +
.../hdfs/server/namenode/FSNamesystem.java | 9 +-
.../src/site/markdown/HdfsRollingUpgrade.md | 2 +-
.../hadoop/hdfs/TestFileConcurrentReader.java | 8 +-
.../apache/hadoop/hdfs/TestFileCreation.java | 8 +-
.../hadoop/hdfs/TestFileCreationClient.java | 10 +-
.../org/apache/hadoop/hdfs/TestFileStatus.java | 6 +-
.../apache/hadoop/hdfs/TestLeaseRecovery2.java | 8 +-
.../apache/hadoop/hdfs/TestPersistBlocks.java | 6 +-
.../hadoop/hdfs/TestReadWhileWriting.java | 6 +-
.../TestUnsetAndChangeDirectoryEcPolicy.java | 13 +
.../TestBlocksWithNotEnoughRacks.java | 6 +-
.../server/namenode/TestFSNamesystemLock.java | 2 +-
.../hadoop/mapred/LocalContainerLauncher.java | 13 +-
.../hadoop/mapred/TaskAttemptListenerImpl.java | 11 +-
.../org/apache/hadoop/mapred/YarnChild.java | 19 +-
.../apache/hadoop/mapred/YarnOutputFiles.java | 2 -
.../jobhistory/JobHistoryCopyService.java | 7 +-
.../jobhistory/JobHistoryEventHandler.java | 6 +-
.../hadoop/mapreduce/v2/app/MRAppMaster.java | 15 +-
.../mapreduce/v2/app/TaskHeartbeatHandler.java | 7 +-
.../v2/app/client/MRClientService.java | 6 +-
.../v2/app/commit/CommitterEventHandler.java | 8 +-
.../mapreduce/v2/app/job/impl/JobImpl.java | 6 +-
.../v2/app/job/impl/TaskAttemptImpl.java | 7 +-
.../mapreduce/v2/app/job/impl/TaskImpl.java | 6 +-
.../v2/app/launcher/ContainerLauncherImpl.java | 7 +-
.../v2/app/local/LocalContainerAllocator.java | 8 +-
.../mapreduce/v2/app/rm/RMCommunicator.java | 7 +-
.../v2/app/rm/RMContainerAllocator.java | 6 +-
.../v2/app/rm/RMContainerRequestor.java | 7 +-
.../CheckpointAMPreemptionPolicy.java | 8 +-
.../rm/preemption/KillAMPreemptionPolicy.java | 8 +-
.../v2/app/speculate/DefaultSpeculator.java | 7 +-
.../mapreduce/v2/app/webapp/AppController.java | 7 +-
.../mapred/TestLocalContainerLauncher.java | 8 +-
.../jobhistory/TestJobHistoryEventHandler.java | 8 +-
.../mapreduce/jobhistory/TestJobSummary.java | 7 +-
.../apache/hadoop/mapreduce/v2/app/MRApp.java | 6 +-
.../hadoop/mapreduce/v2/app/MRAppBenchmark.java | 8 +-
.../mapreduce/v2/app/TestMRAppMaster.java | 15 +-
.../hadoop/mapreduce/v2/app/TestRecovery.java | 6 +-
.../mapreduce/v2/app/TestRuntimeEstimators.java | 7 +-
.../v2/app/job/impl/TestMapReduceChildJVM.java | 7 +-
.../mapreduce/v2/app/job/impl/TestTaskImpl.java | 6 +-
.../v2/app/launcher/TestContainerLauncher.java | 9 +-
.../app/launcher/TestContainerLauncherImpl.java | 7 +-
.../v2/app/rm/TestRMContainerAllocator.java | 8 +-
.../yarn/api/ApplicationMasterProtocol.java | 21 +-
.../records/ApplicationSubmissionContext.java | 17 +-
.../ifile/IndexedFileAggregatedLogsBlock.java | 14 +-
.../LogAggregationIndexedFileController.java | 397 +++++++++++++------
.../TestLogAggregationIndexFileController.java | 67 +++-
.../server/nodemanager/ContainerExecutor.java | 44 +-
.../nodemanager/LinuxContainerExecutor.java | 8 +
.../launcher/ContainerLaunch.java | 25 --
.../runtime/DefaultLinuxContainerRuntime.java | 6 +
.../DelegatingLinuxContainerRuntime.java | 11 +
.../runtime/DockerLinuxContainerRuntime.java | 7 +
.../runtime/ContainerRuntime.java | 11 +
.../launcher/TestContainerLaunch.java | 73 +++-
.../ApplicationMasterService.java | 26 +-
.../resourcemanager/DefaultAMSProcessor.java | 5 +
.../rmapp/attempt/RMAppAttemptImpl.java | 6 +-
.../scheduler/AbstractYarnScheduler.java | 13 +-
.../TestWorkPreservingUnmanagedAM.java | 159 ++++++++
.../yarn/server/router/webapp/AboutBlock.java | 91 +++++
.../yarn/server/router/webapp/AboutPage.java | 37 ++
.../yarn/server/router/webapp/AppsBlock.java | 130 ++++++
.../yarn/server/router/webapp/AppsPage.java | 77 ++++
.../server/router/webapp/FederationBlock.java | 176 ++++++++
.../server/router/webapp/FederationPage.java | 57 +++
.../yarn/server/router/webapp/NavBlock.java | 46 +++
.../yarn/server/router/webapp/NodesBlock.java | 109 +++++
.../yarn/server/router/webapp/NodesPage.java | 60 +++
.../server/router/webapp/RouterController.java | 60 +++
.../yarn/server/router/webapp/RouterView.java | 52 +++
.../yarn/server/router/webapp/RouterWebApp.java | 6 +
.../src/site/markdown/Federation.md | 6 +-
83 files changed, 1807 insertions(+), 400 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
