This is an automated email from the ASF dual-hosted git repository.
bteke pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
from af5c8e70ea4b YARN-11645. Order the queues by queuePath in json assert
tests. (#6432)
add dd72e8fbc364 YARN-11041. Replace all occurences of queuePath with the
new QueuePath class - followup (#5332)
No new revisions were added by this update.
Summary of changes:
.../hadoop/yarn/client/cli/TestSchedConfCLI.java | 5 +-
.../policygenerator/TestPolicyGenerator.java | 17 +-
.../reservation/AbstractReservationSystem.java | 9 +-
.../reservation/CapacityOverTimePolicy.java | 4 +-
.../ReservationSchedulerConfiguration.java | 23 +-
.../planning/SimpleCapacityReplanner.java | 3 +-
.../capacity/AbstractAutoCreatedLeafQueue.java | 18 +-
.../scheduler/capacity/AbstractCSQueue.java | 28 +-
.../scheduler/capacity/AbstractLeafQueue.java | 26 +-
.../scheduler/capacity/AbstractParentQueue.java | 8 +-
.../capacity/AutoCreatedQueueTemplate.java | 84 ++---
.../capacity/CSQueuePreemptionSettings.java | 8 +-
.../scheduler/capacity/CSQueueUtils.java | 2 +-
.../scheduler/capacity/CapacityScheduler.java | 2 +-
.../capacity/CapacitySchedulerConfigValidator.java | 4 +-
.../capacity/CapacitySchedulerConfiguration.java | 366 ++++++++++-----------
.../capacity/CapacitySchedulerQueueManager.java | 43 ++-
.../scheduler/capacity/ManagedParentQueue.java | 47 ++-
.../scheduler/capacity/ParentQueue.java | 2 +-
.../scheduler/capacity/PlanQueue.java | 2 +-
.../capacity/QueueAllocationSettings.java | 2 +-
.../capacity/QueueAppLifetimeAndLimitSettings.java | 6 +-
.../capacity/QueueNodeLabelsSettings.java | 6 +-
.../scheduler/capacity/QueuePath.java | 69 +++-
.../scheduler/capacity/QueuePrefixes.java | 57 ++++
.../scheduler/capacity/QueueStateHelper.java | 2 +-
.../scheduler/capacity/UserWeights.java | 4 +-
.../conf/ConfigurationUpdateAssembler.java | 80 +++--
.../capacity/conf/QueueCapacityConfigParser.java | 6 +-
.../scheduler/fair/AllocationConfiguration.java | 27 +-
.../scheduler/fair/FairScheduler.java | 13 +-
.../converter/FSConfigToCSConfigConverter.java | 5 +-
.../scheduler/fair/converter/FSQueueConverter.java | 28 +-
.../fair/converter/QueuePlacementConverter.java | 21 +-
.../weightconversion/WeightToPercentConverter.java | 5 +-
.../weightconversion/WeightToWeightConverter.java | 8 +-
.../security/CapacityReservationsACLsManager.java | 2 +-
.../security/FairReservationsACLsManager.java | 3 +-
.../webapp/dao/CapacitySchedulerInfo.java | 3 +-
.../webapp/dao/CapacitySchedulerQueueInfo.java | 14 +-
.../webapp/dao/FairSchedulerQueueInfo.java | 7 +-
.../webapp/dao/LeafQueueTemplateInfo.java | 7 +-
.../yarn/server/resourcemanager/ACLsTestBase.java | 9 +
.../resourcemanager/ReservationACLsTestBase.java | 22 +-
.../server/resourcemanager/TestAppManager.java | 138 ++++----
.../TestApplicationMasterServiceCapacity.java | 38 ++-
.../TestWorkPreservingRMRestart.java | 92 +++---
.../TestProportionalCapacityPreemptionPolicy.java | 31 +-
...lCapacityPreemptionPolicyForNodePartitions.java | 3 +-
...ortionalCapacityPreemptionPolicyIntraQueue.java | 14 +-
.../capacity/mockframework/MockQueueHierarchy.java | 3 +-
.../nodelabels/TestRMNodeLabelsManager.java | 16 +-
.../reservation/ReservationSystemTestUtil.java | 70 ++--
.../TestCapacitySchedulerPlanFollower.java | 9 +-
.../planning/TestSimpleCapacityReplanner.java | 3 +-
.../rmapp/TestApplicationLifetimeMonitor.java | 59 ++--
.../CapacitySchedulerConfigGeneratorForTest.java | 16 +-
.../CapacitySchedulerQueueCalculationTestBase.java | 33 +-
.../capacity/CapacitySchedulerQueueHelpers.java | 88 +++--
.../scheduler/capacity/QueueAssertionBuilder.java | 18 +-
.../TestAbsoluteResourceConfiguration.java | 74 +++--
.../TestAbsoluteResourceWithAutoQueue.java | 45 +--
.../scheduler/capacity/TestApplicationLimits.java | 113 ++++---
.../capacity/TestApplicationLimitsByPartition.java | 23 +-
.../TestApplicationPriorityACLConfiguration.java | 40 ++-
.../capacity/TestApplicationPriorityACLs.java | 12 +-
.../TestAutoCreatedQueueDeletionPolicy.java | 23 +-
.../capacity/TestAutoCreatedQueueTemplate.java | 156 +++++----
.../capacity/TestCSAllocateCustomResource.java | 11 +-
.../capacity/TestCSMaxRunningAppsEnforcer.java | 14 +-
.../scheduler/capacity/TestCapacityScheduler.java | 69 ++--
.../TestCapacitySchedulerAmbiguousLeafs.java | 38 ++-
.../capacity/TestCapacitySchedulerApps.java | 9 +-
.../TestCapacitySchedulerAutoCreatedQueueBase.java | 78 +++--
...apacitySchedulerAutoCreatedQueuePreemption.java | 10 +-
.../TestCapacitySchedulerAutoQueueCreation.java | 19 +-
.../TestCapacitySchedulerConfigValidator.java | 6 +-
.../TestCapacitySchedulerConfiguration.java | 26 +-
.../TestCapacitySchedulerDynamicBehavior.java | 4 +-
.../TestCapacitySchedulerLazyPreemption.java | 3 +-
.../capacity/TestCapacitySchedulerMultiNodes.java | 9 +-
.../TestCapacitySchedulerNewQueueAutoCreation.java | 157 +++++----
...lerNewQueueAutoCreationWithCapacityVectors.java | 38 +--
.../TestCapacitySchedulerNodeLabelUpdate.java | 52 +--
.../capacity/TestCapacitySchedulerNodes.java | 4 +-
.../capacity/TestCapacitySchedulerOvercommit.java | 15 +-
.../capacity/TestCapacitySchedulerPerf.java | 13 +-
.../capacity/TestCapacitySchedulerQueueACLs.java | 44 ++-
.../capacity/TestCapacitySchedulerQueues.java | 67 ++--
.../TestCapacitySchedulerSurgicalPreemption.java | 57 ++--
.../capacity/TestCapacitySchedulerWeightMode.java | 66 ++--
...estCapacitySchedulerWithMultiResourceTypes.java | 49 +--
...stCapacitySchedulerWorkflowPriorityMapping.java | 16 +-
.../scheduler/capacity/TestChildQueueOrder.java | 11 +-
.../capacity/TestContainerAllocation.java | 49 +--
.../scheduler/capacity/TestLeafQueue.java | 186 ++++++-----
.../TestMixedQueueResourceCalculation.java | 6 +-
.../capacity/TestNodeLabelContainerAllocation.java | 244 +++++++-------
.../scheduler/capacity/TestParentQueue.java | 112 +++----
.../scheduler/capacity/TestQueueMappings.java | 9 +-
.../scheduler/capacity/TestQueueParsing.java | 237 ++++++-------
.../scheduler/capacity/TestQueuePath.java | 152 +++++++--
.../scheduler/capacity/TestQueueState.java | 21 +-
.../scheduler/capacity/TestQueueStateManager.java | 15 +-
.../scheduler/capacity/TestReservations.java | 37 +--
.../TestUniformQueueResourceCalculation.java | 12 +-
.../scheduler/capacity/TestUtils.java | 56 ++--
.../conf/TestConfigurationUpdateAssembler.java | 3 +-
.../conf/TestMutableCSConfigurationProvider.java | 12 +-
.../conf/TestQueueCapacityConfigParser.java | 35 +-
.../constraint/TestPlacementProcessor.java | 13 +-
.../fair/TestAllocationFileLoaderService.java | 25 +-
.../converter/TestFSConfigToCSConfigConverter.java | 53 +--
.../fair/converter/TestFSQueueConverter.java | 148 +++++----
.../converter/TestQueuePlacementConverter.java | 3 +-
.../TestWeightToPercentageConverter.java | 34 +-
.../TestWeightToWeightConverter.java | 24 +-
.../scheduler/fifo/TestFifoScheduler.java | 6 +-
.../scheduler/policy/TestFairOrderingPolicy.java | 4 +-
.../resourcemanager/webapp/TestRMWebApp.java | 80 ++---
.../webapp/TestRMWebServiceAppsNodelabel.java | 15 +-
.../webapp/TestRMWebServicesAppsModification.java | 40 ++-
.../webapp/TestRMWebServicesCapacitySched.java | 7 +-
.../TestRMWebServicesConfigurationMutation.java | 113 ++++---
.../TestRMWebServicesForCSWithPartitions.java | 76 +++--
.../webapp/TestRMWebServicesReservation.java | 10 +-
...esSchedulerActivitiesWithMultiNodesEnabled.java | 17 +-
.../router/webapp/BaseRouterWebServicesTest.java | 5 +
.../webapp/MockDefaultRequestInterceptorREST.java | 12 +-
.../webapp/TestableFederationInterceptorREST.java | 13 +-
130 files changed, 2716 insertions(+), 2277 deletions(-)
create mode 100644
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/QueuePrefixes.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]