Merge branch 'trunk' into HADOOP-12111
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c3931827 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c3931827 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c3931827 Branch: refs/heads/HADOOP-12111 Commit: c393182754f8d36f7068fdcde1247486488a479d Parents: f9819cb 3da0bed Author: Allen Wittenauer <[email protected]> Authored: Wed Aug 5 15:40:22 2015 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Wed Aug 5 15:40:22 2015 -0700 ---------------------------------------------------------------------- BUILDING.txt | 34 +- hadoop-common-project/hadoop-common/CHANGES.txt | 12 + .../apache/hadoop/fs/DelegateToFileSystem.java | 19 +- .../org/apache/hadoop/io/nativeio/NativeIO.c | 2 + .../src/main/resources/core-default.xml | 6 + .../apache/hadoop/crypto/TestCryptoCodec.java | 11 +- ...yptoStreamsWithOpensslAesCtrCryptoCodec.java | 2 +- .../hadoop/io/TestSequenceFileAppend.java | 6 +- .../apache/hadoop/test/GenericTestUtils.java | 9 +- hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 4 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 7 + .../hdfs/server/datanode/VolumeScanner.java | 12 +- .../src/test/resources/testHDFSConf.xml | 2 +- hadoop-project/pom.xml | 4 +- hadoop-tools/hadoop-aws/pom.xml | 2 +- .../org/apache/hadoop/fs/s3a/Constants.java | 9 +- .../hadoop/fs/s3a/S3AFastOutputStream.java | 2 +- .../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 26 +- .../apache/hadoop/fs/s3a/S3AOutputStream.java | 15 +- .../src/site/markdown/tools/hadoop-aws/index.md | 6 + .../fs/azure/TestWasbUriAndConfiguration.java | 30 +- .../src/test/resources/azure-test.xml | 4 + hadoop-yarn-project/CHANGES.txt | 11 + .../yarn/api/records/ApplicationReport.java | 17 +- .../src/main/proto/yarn_protos.proto | 1 + .../hadoop/yarn/client/cli/ApplicationCLI.java | 4 +- .../yarn/client/api/impl/TestYarnClient.java | 10 +- .../hadoop/yarn/client/cli/TestYarnCLI.java | 3 +- .../impl/pb/ApplicationReportPBImpl.java | 12 + .../hadoop/yarn/api/TestApplicatonReport.java | 3 +- ...pplicationHistoryManagerOnTimelineStore.java | 13 +- ...pplicationHistoryManagerOnTimelineStore.java | 2 + .../metrics/ApplicationMetricsConstants.java | 3 + .../hadoop/yarn/server/webapp/AppBlock.java | 1 + .../hadoop/yarn/server/webapp/dao/AppInfo.java | 6 + .../impl/container-executor.c | 63 +- .../metrics/ApplicationCreatedEvent.java | 9 +- .../metrics/SystemMetricsPublisher.java | 6 +- .../recovery/FileSystemRMStateStore.java | 209 ++++-- .../recovery/LeveldbRMStateStore.java | 114 +++- .../recovery/MemoryRMStateStore.java | 57 ++ .../recovery/NullRMStateStore.java | 23 + .../resourcemanager/recovery/RMStateStore.java | 153 ++++- .../recovery/RMStateStoreEventType.java | 5 +- .../RMStateStoreStoreReservationEvent.java | 56 ++ .../recovery/ZKRMStateStore.java | 124 +++- .../reservation/ReservationSystemUtil.java | 102 ++- .../server/resourcemanager/rmapp/RMAppImpl.java | 3 +- .../scheduler/capacity/AbstractCSQueue.java | 8 +- .../scheduler/capacity/CSAssignment.java | 11 +- .../scheduler/capacity/LeafQueue.java | 10 +- .../scheduler/capacity/ParentQueue.java | 4 +- .../capacity/allocator/AllocationState.java | 28 + .../capacity/allocator/ContainerAllocation.java | 76 +++ .../capacity/allocator/ContainerAllocator.java | 115 ++++ .../allocator/RegularContainerAllocator.java | 629 ++++++++++++++++++ .../scheduler/common/fica/FiCaSchedulerApp.java | 658 ++----------------- .../resourcemanager/webapp/dao/AppInfo.java | 7 + .../yarn_server_resourcemanager_recovery.proto | 18 +- .../metrics/TestSystemMetricsPublisher.java | 10 + .../recovery/RMStateStoreTestBase.java | 186 ++++++ .../recovery/TestFSRMStateStore.java | 1 + .../recovery/TestLeveldbRMStateStore.java | 6 + .../recovery/TestZKRMStateStore.java | 1 + .../reservation/ReservationSystemTestUtil.java | 16 + .../TestInMemoryReservationAllocation.java | 36 +- .../scheduler/capacity/TestLeafQueue.java | 161 ++--- .../webapp/TestRMWebServicesApps.java | 14 +- .../src/site/markdown/ResourceManagerRest.md | 13 +- .../src/site/markdown/TimelineServer.md | 21 +- 70 files changed, 2380 insertions(+), 883 deletions(-) ----------------------------------------------------------------------
