You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by as...@apache.org on 2018/01/31 15:57:56 UTC
[32/32] hadoop git commit: Merge branch 'YARN-6592' into trunk
Merge branch 'YARN-6592' into trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8d1e2c64
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8d1e2c64
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8d1e2c64
Branch: refs/heads/trunk
Commit: 8d1e2c6409a44f4515a1549ae82c7e2597e96467
Parents: 7288b08 8df7666
Author: Arun Suresh <as...@apache.org>
Authored: Wed Jan 31 01:42:42 2018 -0800
Committer: Arun Suresh <as...@apache.org>
Committed: Wed Jan 31 01:42:42 2018 -0800
----------------------------------------------------------------------
.../v2/app/rm/TestRMContainerAllocator.java | 15 +-
.../hadoop/yarn/sls/nodemanager/NodeInfo.java | 6 +
.../yarn/sls/scheduler/RMNodeWrapper.java | 6 +
.../sls/scheduler/SLSCapacityScheduler.java | 15 +-
.../yarn/sls/scheduler/SLSFairScheduler.java | 12 +-
.../dev-support/findbugs-exclude.xml | 8 +
.../yarn/ams/ApplicationMasterServiceUtils.java | 16 +
.../api/protocolrecords/AllocateRequest.java | 42 ++
.../api/protocolrecords/AllocateResponse.java | 23 +
.../RegisterApplicationMasterRequest.java | 42 +-
.../hadoop/yarn/api/records/Container.java | 15 +
.../api/records/RejectedSchedulingRequest.java | 70 ++
.../yarn/api/records/RejectionReason.java | 44 ++
.../hadoop/yarn/api/records/ResourceSizing.java | 91 +++
.../yarn/api/records/SchedulingRequest.java | 206 +++++
.../yarn/api/resource/PlacementConstraint.java | 744 +++++++++++++++++++
.../yarn/api/resource/PlacementConstraints.java | 320 ++++++++
.../hadoop/yarn/api/resource/package-info.java | 23 +
.../hadoop/yarn/conf/YarnConfiguration.java | 31 +
...SchedulerInvalidResoureRequestException.java | 47 ++
.../src/main/proto/yarn_protos.proto | 86 +++
.../src/main/proto/yarn_service_protos.proto | 3 +
.../api/resource/TestPlacementConstraints.java | 107 +++
.../distributedshell/ApplicationMaster.java | 124 +++-
.../applications/distributedshell/Client.java | 14 +
.../distributedshell/PlacementSpec.java | 137 ++++
.../hadoop/yarn/client/api/AMRMClient.java | 38 +-
.../yarn/client/api/async/AMRMClientAsync.java | 48 ++
.../api/async/impl/AMRMClientAsyncImpl.java | 49 +-
.../yarn/client/api/impl/AMRMClientImpl.java | 142 +++-
.../client/api/impl/BaseAMRMClientTest.java | 212 ++++++
.../yarn/client/api/impl/TestAMRMClient.java | 156 +---
.../api/impl/TestAMRMClientOnRMRestart.java | 9 +-
.../TestAMRMClientPlacementConstraints.java | 204 +++++
.../PlacementConstraintFromProtoConverter.java | 116 +++
.../pb/PlacementConstraintToProtoConverter.java | 174 +++++
.../apache/hadoop/yarn/api/pb/package-info.java | 23 +
.../impl/pb/AllocateRequestPBImpl.java | 84 +++
.../impl/pb/AllocateResponsePBImpl.java | 85 +++
.../RegisterApplicationMasterRequestPBImpl.java | 106 ++-
.../api/records/impl/pb/ContainerPBImpl.java | 31 +
.../yarn/api/records/impl/pb/ProtoUtils.java | 43 ++
.../pb/RejectedSchedulingRequestPBImpl.java | 148 ++++
.../records/impl/pb/ResourceSizingPBImpl.java | 128 ++++
.../impl/pb/SchedulingRequestPBImpl.java | 296 ++++++++
.../PlacementConstraintTransformations.java | 200 +++++
.../hadoop/yarn/api/resource/package-info.java | 23 +
.../yarn/security/ContainerTokenIdentifier.java | 69 +-
.../src/main/proto/yarn_security_token.proto | 1 +
.../src/main/resources/yarn-default.xml | 36 +
.../hadoop/yarn/api/BasePBImplRecordsTest.java | 11 +
.../hadoop/yarn/api/TestPBImplRecords.java | 21 +
.../TestPlacementConstraintPBConversion.java | 195 +++++
.../TestPlacementConstraintTransformations.java | 166 +++++
.../api/protocolrecords/NMContainerStatus.java | 14 +
.../impl/pb/NMContainerStatusPBImpl.java | 33 +
.../server/scheduler/SchedulerRequestKey.java | 11 +
.../yarn_server_common_service_protos.proto | 1 +
.../containermanager/ContainerManagerImpl.java | 3 +-
.../container/ContainerImpl.java | 19 +-
.../ApplicationMasterService.java | 15 +
.../resourcemanager/DefaultAMSProcessor.java | 13 +-
.../resourcemanager/RMActiveServiceContext.java | 30 +
.../yarn/server/resourcemanager/RMContext.java | 11 +
.../server/resourcemanager/RMContextImpl.java | 25 +
.../server/resourcemanager/ResourceManager.java | 22 +
.../rmapp/attempt/RMAppAttemptImpl.java | 5 +-
.../rmcontainer/RMContainer.java | 8 +
.../rmcontainer/RMContainerImpl.java | 37 +-
.../server/resourcemanager/rmnode/RMNode.java | 7 +
.../resourcemanager/rmnode/RMNodeImpl.java | 6 +
.../scheduler/AbstractYarnScheduler.java | 21 +-
.../scheduler/AppSchedulingInfo.java | 214 ++++--
.../ApplicationPlacementAllocatorFactory.java | 68 ++
.../scheduler/ApplicationPlacementFactory.java | 63 --
.../scheduler/ContainerUpdateContext.java | 4 +-
.../scheduler/ResourceScheduler.java | 13 +
.../scheduler/SchedulerApplicationAttempt.java | 24 +-
.../scheduler/SchedulerNode.java | 20 +-
.../scheduler/YarnScheduler.java | 15 +-
.../scheduler/capacity/CapacityScheduler.java | 154 +++-
.../CapacitySchedulerConfiguration.java | 5 +
.../allocator/RegularContainerAllocator.java | 3 +-
.../scheduler/common/ContainerRequest.java | 12 +
.../scheduler/common/PendingAsk.java | 6 +
.../common/ResourceAllocationCommitter.java | 12 +-
.../scheduler/common/fica/FiCaSchedulerApp.java | 43 +-
.../constraint/AllocationTagsManager.java | 564 ++++++++++++++
.../InvalidAllocationTagsQueryException.java | 35 +
.../MemoryPlacementConstraintManager.java | 282 +++++++
.../constraint/PlacementConstraintManager.java | 151 ++++
.../PlacementConstraintManagerService.java | 93 +++
.../constraint/PlacementConstraintsUtil.java | 218 ++++++
.../constraint/algorithm/CircularIterator.java | 86 +++
.../algorithm/DefaultPlacementAlgorithm.java | 254 +++++++
.../algorithm/LocalAllocationTagsManager.java | 167 +++++
.../iterators/PopularTagsIterator.java | 71 ++
.../algorithm/iterators/SerialIterator.java | 53 ++
.../algorithm/iterators/package-info.java | 29 +
.../constraint/algorithm/package-info.java | 29 +
.../api/ConstraintPlacementAlgorithm.java | 43 ++
.../api/ConstraintPlacementAlgorithmInput.java | 32 +
.../api/ConstraintPlacementAlgorithmOutput.java | 58 ++
...traintPlacementAlgorithmOutputCollector.java | 32 +
.../constraint/api/PlacedSchedulingRequest.java | 79 ++
.../constraint/api/SchedulingResponse.java | 70 ++
.../scheduler/constraint/api/package-info.java | 28 +
.../scheduler/constraint/package-info.java | 29 +
.../constraint/processor/BatchedRequests.java | 144 ++++
.../processor/NodeCandidateSelector.java | 38 +
.../processor/PlacementDispatcher.java | 145 ++++
.../processor/PlacementProcessor.java | 361 +++++++++
.../constraint/processor/package-info.java | 29 +
.../scheduler/fair/FairScheduler.java | 12 +-
.../scheduler/fifo/FifoScheduler.java | 7 +-
.../placement/AppPlacementAllocator.java | 68 +-
.../LocalityAppPlacementAllocator.java | 35 +-
.../SingleConstraintAppPlacementAllocator.java | 533 +++++++++++++
.../security/RMContainerTokenSecretManager.java | 21 +-
.../resourcemanager/webapp/NodesPage.java | 3 +
.../webapp/dao/AllocationTagInfo.java | 56 ++
.../webapp/dao/AllocationTagsInfo.java | 59 ++
.../resourcemanager/webapp/dao/NodeInfo.java | 15 +
.../server/resourcemanager/Application.java | 9 +-
.../yarn/server/resourcemanager/MockAM.java | 77 ++
.../yarn/server/resourcemanager/MockNodes.java | 6 +
.../yarn/server/resourcemanager/MockRM.java | 14 +
.../attempt/TestRMAppAttemptTransitions.java | 10 +-
.../rmcontainer/TestRMContainerImpl.java | 151 +++-
.../scheduler/TestAppSchedulingInfo.java | 4 +-
.../capacity/CapacitySchedulerTestBase.java | 79 ++
.../capacity/TestCapacityScheduler.java | 91 +--
.../TestCapacitySchedulerAsyncScheduling.java | 12 +-
.../TestCapacitySchedulerAutoQueueCreation.java | 2 +-
...apacitySchedulerSchedulingRequestUpdate.java | 262 +++++++
.../capacity/TestContainerAllocation.java | 5 +-
.../capacity/TestIncreaseAllocationExpirer.java | 2 +-
...estSchedulingRequestContainerAllocation.java | 269 +++++++
...hedulingRequestContainerAllocationAsync.java | 138 ++++
.../scheduler/capacity/TestUtils.java | 11 +
.../constraint/TestAllocationTagsManager.java | 413 ++++++++++
.../TestBatchedRequestsIterators.java | 82 ++
.../TestPlacementConstraintManagerService.java | 182 +++++
.../TestPlacementConstraintsUtil.java | 309 ++++++++
.../constraint/TestPlacementProcessor.java | 642 ++++++++++++++++
.../algorithm/TestCircularIterator.java | 84 +++
.../TestLocalAllocationTagsManager.java | 139 ++++
.../scheduler/fair/FairSchedulerTestBase.java | 6 +-
.../fair/TestContinuousScheduling.java | 10 +-
.../scheduler/fair/TestFairScheduler.java | 30 +-
.../scheduler/fifo/TestFifoScheduler.java | 33 +-
...stSingleConstraintAppPlacementAllocator.java | 403 ++++++++++
.../resourcemanager/webapp/TestNodesPage.java | 4 +-
.../webapp/TestRMWebServicesNodes.java | 77 +-
.../site/markdown/PlacementConstraints.md.vm | 149 ++++
155 files changed, 13063 insertions(+), 569 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org