Merge branch 'trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a20a3fef Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a20a3fef Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a20a3fef Branch: refs/heads/HDFS-7240 Commit: a20a3fefbe9daf606625dec453d16812aab17b9a Parents: 379e85f 67bbbe1 Author: Anu Engineer <aengin...@apache.org> Authored: Tue Nov 21 10:11:59 2017 -0800 Committer: Anu Engineer <aengin...@apache.org> Committed: Tue Nov 21 10:11:59 2017 -0800 ---------------------------------------------------------------------- .gitignore | 3 + BUILDING.txt | 8 +- .../hadoop-client-integration-tests/pom.xml | 3 + .../hadoop/crypto/key/kms/ValueQueue.java | 6 +- .../org/apache/hadoop/fs/LocatedFileStatus.java | 11 +- .../apache/hadoop/io/retry/RetryPolicies.java | 22 +- .../apache/hadoop/io/retry/TestRetryProxy.java | 22 + .../io/retry/UnreliableImplementation.java | 10 + .../hadoop/io/retry/UnreliableInterface.java | 6 +- .../main/java/org/apache/hadoop/fs/Hdfs.java | 4 +- .../hadoop/hdfs/DistributedFileSystem.java | 4 +- .../hadoop/hdfs/protocol/HdfsFileStatus.java | 80 +- .../hdfs/protocol/HdfsLocatedFileStatus.java | 110 +++ .../hadoop/hdfs/protocolPB/PBHelperClient.java | 65 +- .../ha/RequestHedgingProxyProvider.java | 81 +- .../ha/TestRequestHedgingProxyProvider.java | 58 ++ .../dev-support/findbugsExcludeFile.xml | 7 +- .../hdfs/server/datanode/BlockReceiver.java | 16 +- .../apache/hadoop/hdfs/server/mover/Mover.java | 6 +- .../server/namenode/FSDirStatAndListingOp.java | 61 +- .../hadoop/hdfs/server/namenode/FSEditLog.java | 23 +- .../namenode/snapshot/SnapshotManager.java | 8 +- .../src/main/resources/hdfs-default.xml | 2 +- .../hadoop/hdfs/TestBlockStoragePolicy.java | 10 +- .../apache/hadoop/hdfs/TestDFSOutputStream.java | 2 +- .../hdfs/server/mover/TestStorageMover.java | 8 +- .../hdfs/server/namenode/TestEditLog.java | 4 +- .../server/namenode/TestEditLogAutoroll.java | 10 +- .../hdfs/server/namenode/TestEditLogRace.java | 4 +- .../server/namenode/ha/TestEditLogTailer.java | 8 +- .../snapshot/TestOpenFilesWithSnapshot.java | 117 +++ hadoop-project/pom.xml | 5 +- .../fs/aliyun/oss/AliyunOSSFileSystemStore.java | 4 + .../apache/hadoop/fs/aliyun/oss/Constants.java | 7 + .../site/markdown/tools/hadoop-aliyun/index.md | 2 +- hadoop-tools/hadoop-aws/pom.xml | 2 + hadoop-tools/hadoop-azure/pom.xml | 3 + .../yarn/api/records/ResourceRequest.java | 3 +- .../hadoop/yarn/conf/YarnConfiguration.java | 15 +- .../hadoop/yarn/service/TestApiServer.java | 4 +- .../hadoop/yarn/service/ServiceScheduler.java | 50 +- .../yarn/service/api/records/Component.java | 51 +- .../service/api/records/ReadinessCheck.java | 14 +- .../yarn/service/api/records/Service.java | 15 +- .../yarn/service/client/ServiceClient.java | 10 +- .../yarn/service/component/Component.java | 58 +- .../yarn/service/component/ComponentEvent.java | 11 + .../component/instance/ComponentInstance.java | 83 +- .../yarn/service/conf/RestApiConstants.java | 2 +- .../yarn/service/conf/YarnServiceConf.java | 5 + .../containerlaunch/ContainerLaunchService.java | 2 +- .../containerlaunch/JavaCommandLineBuilder.java | 11 +- .../provider/AbstractProviderService.java | 5 +- .../yarn/service/provider/ProviderService.java | 5 +- .../yarn/service/provider/ProviderUtils.java | 5 +- .../ServiceTimelinePublisher.java | 5 +- .../hadoop/yarn/service/MockServiceAM.java | 66 +- .../hadoop/yarn/service/ServiceTestUtils.java | 5 +- .../hadoop/yarn/service/TestServiceAM.java | 109 +++ .../yarn/service/TestYarnNativeServices.java | 42 +- .../service/monitor/TestServiceMonitor.java | 12 + .../yarn/client/api/impl/TestYarnClient.java | 455 +---------- .../api/impl/TestYarnClientWithReservation.java | 521 ++++++++++++ .../org/apache/hadoop/yarn/webapp/WebApps.java | 10 +- .../src/main/resources/yarn-default.xml | 21 + .../hadoop/yarn/api/TestResourceRequest.java | 47 ++ .../hadoop-yarn-server-common/pom.xml | 5 + .../utils/FederationRegistryClient.java | 338 ++++++++ .../yarn/server/uam/UnmanagedAMPoolManager.java | 141 +++- .../server/uam/UnmanagedApplicationManager.java | 212 +++-- .../yarn/server/utils/AMRMClientUtils.java | 30 +- .../yarn/server/MockResourceManagerFacade.java | 103 +-- .../utils/TestFederationRegistryClient.java | 90 +++ .../uam/TestUnmanagedApplicationManager.java | 100 ++- .../amrmproxy/AMRMProxyApplicationContext.java | 16 + .../AMRMProxyApplicationContextImpl.java | 35 +- .../nodemanager/amrmproxy/AMRMProxyService.java | 83 +- .../amrmproxy/FederationInterceptor.java | 221 +++++- .../containermanager/ContainerManagerImpl.java | 9 +- .../amrmproxy/BaseAMRMProxyTest.java | 14 +- .../amrmproxy/TestAMRMProxyService.java | 21 +- .../amrmproxy/TestFederationInterceptor.java | 126 ++- .../TestableFederationInterceptor.java | 29 +- .../server/resourcemanager/RMAppManager.java | 7 +- .../server/resourcemanager/ResourceManager.java | 14 +- .../FifoIntraQueuePreemptionPlugin.java | 6 + .../placement/ApplicationPlacementContext.java | 52 ++ .../placement/PlacementManager.java | 34 +- .../placement/PlacementRule.java | 7 +- .../UserGroupMappingPlacementRule.java | 284 ++++++- .../server/resourcemanager/rmapp/RMAppImpl.java | 145 +++- .../scheduler/capacity/AbstractCSQueue.java | 2 +- .../capacity/AbstractManagedParentQueue.java | 196 +++-- .../capacity/AutoCreatedLeafQueue.java | 27 +- .../scheduler/capacity/CapacityScheduler.java | 157 +++- .../CapacitySchedulerConfiguration.java | 153 ++++ .../capacity/CapacitySchedulerQueueManager.java | 103 ++- .../scheduler/capacity/ManagedParentQueue.java | 158 ++++ .../scheduler/capacity/ParentQueue.java | 13 - .../scheduler/capacity/PlanQueue.java | 25 +- .../scheduler/common/fica/FiCaSchedulerApp.java | 4 +- .../scheduler/event/AppAddedSchedulerEvent.java | 37 +- .../server/resourcemanager/webapp/RMWebApp.java | 15 - .../server/resourcemanager/TestAppManager.java | 29 +- ...alCapacityPreemptionPolicyMockFramework.java | 3 + ...cityPreemptionPolicyIntraQueueUserLimit.java | 35 + .../TestUserGroupMappingPlacementRule.java | 14 +- .../scheduler/TestSchedulerUtils.java | 1 + .../capacity/TestCapacityScheduler.java | 6 +- .../TestCapacitySchedulerAsyncScheduling.java | 71 ++ .../TestCapacitySchedulerAutoQueueCreation.java | 794 +++++++++++++++++++ .../hadoop/yarn/server/MiniYARNCluster.java | 6 +- .../src/site/markdown/Federation.md | 11 +- .../src/site/markdown/ResourceManagerRest.md | 5 +- .../main/webapp/app/components/nodes-heatmap.js | 6 +- ...er-app-memusage-by-nodes-stacked-barchart.js | 2 +- .../main/webapp/app/components/tree-selector.js | 6 +- .../src/main/webapp/app/styles/app.css | 717 ----------------- .../src/main/webapp/app/styles/app.scss | 723 +++++++++++++++++ .../src/main/webapp/app/styles/colors.scss | 37 + .../src/main/webapp/app/styles/variables.scss | 40 + .../src/main/webapp/app/utils/color-utils.js | 8 +- .../hadoop-yarn-ui/src/main/webapp/package.json | 3 +- .../hadoop-yarn-ui/src/main/webapp/yarn.lock | 674 +++++++++++++++- 124 files changed, 6474 insertions(+), 2173 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a20a3fef/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelperClient.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a20a3fef/hadoop-hdfs-project/hadoop-hdfs/dev-support/findbugsExcludeFile.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a20a3fef/hadoop-project/pom.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
