Merge branch 'trunk' into HDFS-6584
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dba52ce0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dba52ce0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dba52ce0 Branch: refs/heads/trunk Commit: dba52ce0bb42a19ad2a559894c96c64f4051e66d Parents: dc27ee9 3122daa Author: Tsz-Wo Nicholas Sze <[email protected]> Authored: Sat Sep 13 14:56:48 2014 +0800 Committer: Tsz-Wo Nicholas Sze <[email protected]> Committed: Sat Sep 13 14:56:48 2014 +0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 8 +- .../DelegationTokenAuthenticationFilter.java | 3 +- .../delegation/web/TestWebDelegationToken.java | 17 + hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 5 +- .../datanode/TestDataNodeRollingUpgrade.java | 6 +- hadoop-mapreduce-project/CHANGES.txt | 2 +- .../CheckpointAMPreemptionPolicy.java | 2 +- hadoop-yarn-project/CHANGES.txt | 16 +- .../api/records/ApplicationAttemptReport.java | 18 +- .../hadoop/yarn/api/records/ContainerId.java | 48 +- .../hadoop/yarn/conf/YarnConfiguration.java | 13 + .../src/main/proto/yarn_protos.proto | 3 +- .../hadoop/yarn/client/ProtocolHATestBase.java | 2 +- .../yarn/client/api/impl/TestAHSClient.java | 2 + .../yarn/client/api/impl/TestYarnClient.java | 2 + .../hadoop/yarn/client/cli/TestYarnCLI.java | 6 +- .../impl/pb/ApplicationAttemptReportPBImpl.java | 19 + .../api/records/impl/pb/ContainerIdPBImpl.java | 8 +- .../hadoop/yarn/webapp/view/HtmlBlock.java | 12 + .../src/main/resources/yarn-default.xml | 54 +- .../apache/hadoop/yarn/api/TestContainerId.java | 24 +- .../hadoop/yarn/util/TestConverterUtils.java | 17 +- .../ApplicationHistoryManagerImpl.java | 2 +- ...pplicationHistoryManagerOnTimelineStore.java | 511 +++++++++++++++++++ .../ApplicationHistoryServer.java | 11 +- .../FileSystemApplicationHistoryStore.java | 3 +- .../server/timeline/MemoryTimelineStore.java | 10 +- .../TestApplicationHistoryClientService.java | 1 + ...pplicationHistoryManagerOnTimelineStore.java | 317 ++++++++++++ .../yarn/server/api/ApplicationContext.java | 43 +- .../metrics/AppAttemptMetricsConstants.java | 64 +++ .../metrics/ApplicationMetricsConstants.java | 64 +++ .../metrics/ContainerMetricsConstants.java | 60 +++ .../hadoop/yarn/server/utils/BuilderUtils.java | 4 +- .../yarn/server/webapp/AppAttemptBlock.java | 41 +- .../hadoop/yarn/server/webapp/AppBlock.java | 51 +- .../hadoop/yarn/server/webapp/AppsBlock.java | 20 +- .../yarn/server/webapp/ContainerBlock.java | 19 +- .../hadoop/yarn/server/webapp/WebServices.java | 113 +++- .../yarn/server/webapp/dao/AppAttemptInfo.java | 6 + .../hadoop/yarn/server/webapp/dao/AppInfo.java | 17 - .../ApplicationMasterService.java | 2 + .../yarn/server/resourcemanager/RMContext.java | 7 +- .../server/resourcemanager/RMContextImpl.java | 19 +- .../server/resourcemanager/ResourceManager.java | 9 + .../ahs/RMApplicationHistoryWriter.java | 18 +- .../metrics/AppAttemptFinishedEvent.java | 82 +++ .../metrics/AppAttemptRegisteredEvent.java | 81 +++ .../metrics/ApplicationCreatedEvent.java | 78 +++ .../metrics/ApplicationFinishedEvent.java | 75 +++ .../metrics/ContainerCreatedEvent.java | 67 +++ .../metrics/ContainerFinishedEvent.java | 65 +++ .../metrics/SystemMetricsEvent.java | 33 ++ .../metrics/SystemMetricsEventType.java | 34 ++ .../metrics/SystemMetricsPublisher.java | 490 ++++++++++++++++++ .../ProportionalCapacityPreemptionPolicy.java | 3 +- .../recovery/FileSystemRMStateStore.java | 34 +- .../recovery/MemoryRMStateStore.java | 6 +- .../recovery/NullRMStateStore.java | 4 +- .../resourcemanager/recovery/RMStateStore.java | 2 +- .../recovery/ZKRMStateStore.java | 4 +- .../resourcemanager/recovery/records/Epoch.java | 11 +- .../recovery/records/impl/pb/EpochPBImpl.java | 6 +- .../server/resourcemanager/rmapp/RMApp.java | 6 + .../server/resourcemanager/rmapp/RMAppImpl.java | 17 + .../rmapp/attempt/RMAppAttemptImpl.java | 9 +- .../rmcontainer/RMContainerImpl.java | 4 + .../scheduler/AppSchedulingInfo.java | 14 +- .../scheduler/SchedulerApplicationAttempt.java | 2 +- .../server/resourcemanager/TestAppManager.java | 3 + .../resourcemanager/TestClientRMService.java | 3 + .../TestWorkPreservingRMRestart.java | 2 +- .../applicationsmanager/MockAsm.java | 4 + .../metrics/TestSystemMetricsPublisher.java | 355 +++++++++++++ .../recovery/RMStateStoreTestBase.java | 6 +- .../server/resourcemanager/rmapp/MockRMApp.java | 10 + .../rmapp/TestRMAppTransitions.java | 11 + .../attempt/TestRMAppAttemptTransitions.java | 10 + .../rmcontainer/TestRMContainerImpl.java | 11 + .../TestSchedulerApplicationAttempt.java | 4 +- .../scheduler/capacity/TestChildQueueOrder.java | 3 + .../scheduler/capacity/TestUtils.java | 6 +- .../fair/TestMaxRunningAppsEnforcer.java | 2 +- .../scheduler/fifo/TestFifoScheduler.java | 7 + .../src/site/apt/ResourceManagerRest.apt.vm | 6 +- 85 files changed, 3031 insertions(+), 238 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dba52ce0/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ----------------------------------------------------------------------
