From 6234c11e95cca880c4c5c581cebd866a9195c02b Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Thu, 9 Oct 2025 17:46:44 +0200 Subject: [PATCH 01/19] YARN-11874. FIX YARN REST IF --- .../hadoop-client-minicluster/pom.xml | 7 + hadoop-project/pom.xml | 5 + .../pom.xml | 4 + .../webapp/JAXBContextResolver.java | 144 +- .../resourcemanager/webapp/RMWebApp.java | 6 +- .../webapp/dao/NodeLabelsInfo.java | 32 +- .../ClassSerialisationConfig.java | 247 +++ .../jsonprovider/ExcludeRootJSONProvider.java | 90 + .../jsonprovider/IncludeRootJSONProvider.java | 90 + .../jsonprovider/JsonProviderFeature.java | 36 + .../webapp/TestRMWebServiceAppsNodelabel.java | 9 +- .../webapp/TestRMWebServices.java | 6 +- .../webapp/TestRMWebServicesAppAttempts.java | 7 +- ...stRMWebServicesAppCustomResourceTypes.java | 3 +- .../webapp/TestRMWebServicesApps.java | 91 +- ...tRMWebServicesAppsCustomResourceTypes.java | 7 +- .../TestRMWebServicesAppsModification.java | 91 +- .../TestRMWebServicesCapacitySched.java | 3 +- ...MWebServicesCapacitySchedDefaultLabel.java | 3 +- ...WebServicesCapacitySchedDynamicConfig.java | 4 +- ...apacitySchedDynamicConfigAbsoluteMode.java | 6 +- ...sCapacitySchedDynamicConfigWeightMode.java | 4 +- ...pacitySchedDynamicConfigWeightModeDQC.java | 4 +- ...vicesCapacitySchedLegacyQueueCreation.java | 4 +- ...ySchedLegacyQueueCreationAbsoluteMode.java | 3 +- ...rvicesCapacitySchedulerConfigMutation.java | 9 +- ...WebServicesCapacitySchedulerMixedMode.java | 4 +- ...hedulerMixedModeAbsoluteAndPercentage.java | 4 +- ...xedModeAbsoluteAndPercentageAndWeight.java | 4 +- ...eAbsoluteAndPercentageAndWeightVector.java | 4 +- ...rMixedModeAbsoluteAndPercentageVector.java | 4 +- ...tySchedulerMixedModeAbsoluteAndWeight.java | 4 +- ...dulerMixedModeAbsoluteAndWeightVector.java | 4 +- ...SchedulerMixedModePercentageAndWeight.java | 4 +- ...lerMixedModePercentageAndWeightVector.java | 4 +- ...estRMWebServicesConfigurationMutation.java | 56 +- .../webapp/TestRMWebServicesContainers.java | 4 +- ...WebServicesCustomResourceTypesCommons.java | 2 +- ...ServicesDelegationTokenAuthentication.java | 16 +- .../TestRMWebServicesDelegationTokens.java | 17 +- .../TestRMWebServicesForCSWithPartitions.java | 4 +- .../webapp/TestRMWebServicesNodeLabels.java | 18 +- .../webapp/TestRMWebServicesNodes.java | 29 +- .../webapp/TestRMWebServicesReservation.java | 74 +- .../TestRMWebServicesSchedulerActivities.java | 4 +- ...edulerActivitiesWithMultiNodesEnabled.java | 4 +- .../webapp/TestRMWebappAuthentication.java | 4 +- .../webapp/TestWebServiceUtil.java | 17 +- .../TestRMWebServicesFairScheduler.java | 6 +- ...vicesFairSchedulerCustomResourceTypes.java | 10 +- .../helper/AppInfoJsonVerifications.java | 6 +- ...ation-absolute-hierarchy-after-update.json | 412 ++--- ...tion-absolute-hierarchy-before-update.json | 420 ++--- ...bsolute-hierarchy-legacy-after-update.json | 412 ++--- ...solute-hierarchy-legacy-before-update.json | 420 ++--- .../webapp/dynamic-testAbsoluteMode-0.json | 624 +++---- .../webapp/dynamic-testAbsoluteMode-16.json | 588 ++----- .../webapp/dynamic-testAbsoluteMode-32.json | 588 ++----- .../dynamic-testAbsoluteMode-legacy-0.json | 616 +++---- .../webapp/dynamic-testPercentageMode-0.json | 810 ++++----- .../webapp/dynamic-testPercentageMode-16.json | 774 ++++----- .../dynamic-testPercentageMode-legacy-0.json | 774 ++++----- .../webapp/dynamic-testWeightMode-0.json | 600 +++---- .../webapp/dynamic-testWeightMode-16.json | 564 ++---- .../webapp/dynamic-testWeightMode-32.json | 564 ++---- .../dynamic-testWeightMode-after-aqc.json | 1524 ++++++----------- .../dynamic-testWeightMode-before-aqc.json | 546 ++---- .../dynamic-testWeightMode-legacy-0.json | 556 ++---- .../dynamic-testWeightMode-legacy-16.json | 556 ++---- .../dynamic-testWeightMode-legacy-32.json | 556 ++---- ...namic-testWeightMode-legacy-after-aqc.json | 1508 ++++++---------- ...amic-testWeightMode-legacy-before-aqc.json | 538 ++---- ...-testSchedulerAbsoluteAndPercentage-0.json | 612 +++---- ...testSchedulerAbsoluteAndPercentage-16.json | 596 +++---- ...testSchedulerAbsoluteAndPercentage-32.json | 576 ++----- ...dulerAbsoluteAndPercentageAndWeight-0.json | 608 +++---- ...ulerAbsoluteAndPercentageAndWeight-16.json | 592 +++---- ...ulerAbsoluteAndPercentageAndWeight-32.json | 572 ++----- ...AbsoluteAndPercentageAndWeightMixed-0.json | 610 +++---- ...bsoluteAndPercentageAndWeightMixed-16.json | 594 +++---- ...bsoluteAndPercentageAndWeightMixed-32.json | 574 ++----- ...ixed-testSchedulerAbsoluteAndWeight-0.json | 612 +++---- ...xed-testSchedulerAbsoluteAndWeight-16.json | 596 +++---- ...xed-testSchedulerAbsoluteAndWeight-32.json | 576 ++----- ...ed-testSchedulerPercentageAndWeight-0.json | 600 +++---- ...d-testSchedulerPercentageAndWeight-16.json | 564 ++---- ...d-testSchedulerPercentageAndWeight-32.json | 564 ++---- ...sponse-AbsoluteModeLegacyAutoCreation.json | 312 ++-- .../scheduler-response-PerUserResources.json | 404 ++--- ...onse-PercentageModeLegacyAutoCreation.json | 226 +-- .../resources/webapp/scheduler-response.json | 352 ++-- 91 files changed, 8792 insertions(+), 16520 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/webapp/jsonprovider/ClassSerialisationConfig.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index fe58ccbf60e2a..4c0dca5032ad1 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -725,6 +725,13 @@ **/*.java + + + *:* + + **/*.html + + *:* diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index f7aa379dac087..5cbfe598eef4a 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -2146,6 +2146,11 @@ jersey-media-json-jettison ${jersey2.version} + + org.glassfish.jersey.media + jersey-media-moxy + ${jersey2.version} + org.glassfish.jaxb jaxb-runtime diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index b02097814aad6..5bd1a9221d4fd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -265,6 +265,10 @@ org.glassfish.jersey.media jersey-media-json-jettison + + org.glassfish.jersey.media + jersey-media-moxy + org.mockito mockito-junit-jupiter diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java index 37ea2ee04e32f..b4ad232908e82 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java @@ -18,15 +18,18 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import org.eclipse.persistence.jaxb.JAXBContextFactory; +import org.eclipse.persistence.jaxb.MarshallerProperties; +import org.glassfish.jersey.jettison.JettisonConfig; import org.glassfish.jersey.jettison.JettisonJaxbContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; -import java.util.ArrayList; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.HashMap; +import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; @@ -35,46 +38,7 @@ import javax.xml.bind.JAXBContext; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.UserInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerQueueInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FifoSchedulerInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.UserMetricsInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerQueueInfoList; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.UsersInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.StatisticsItemInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerHealthInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FairSchedulerQueueInfoList; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInformationsInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.QueueAclsInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.QueueAclInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ContainerLaunchContextInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LocalResourceInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo; -import org.apache.hadoop.yarn.webapp.RemoteExceptionData; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ClassSerialisationConfig; @Singleton @Provider @@ -82,7 +46,7 @@ public class JAXBContextResolver implements ContextResolver { private static final Logger LOG = LoggerFactory.getLogger(JAXBContextResolver.class.getName()); - private final Map typesContextMap; + private final Map typesContextMap = new HashMap<>(); public JAXBContextResolver() throws Exception { this(new Configuration()); @@ -90,83 +54,29 @@ public JAXBContextResolver() throws Exception { @Inject public JAXBContextResolver(@javax.inject.Named("conf") Configuration conf) throws Exception { - - JAXBContext context; - JAXBContext unWrappedRootContext; - - // you have to specify all the dao classes here - final Class[] cTypes = - { AppInfo.class, AppAttemptInfo.class, AppAttemptsInfo.class, - ClusterInfo.class, CapacitySchedulerQueueInfo.class, - FifoSchedulerInfo.class, SchedulerTypeInfo.class, NodeInfo.class, - UserMetricsInfo.class, CapacitySchedulerInfo.class, - ClusterMetricsInfo.class, SchedulerInfo.class, AppsInfo.class, - NodesInfo.class, RemoteExceptionData.class, - CapacitySchedulerQueueInfoList.class, ResourceInfo.class, - UsersInfo.class, UserInfo.class, ApplicationStatisticsInfo.class, - StatisticsItemInfo.class, CapacitySchedulerHealthInfo.class, - FairSchedulerQueueInfoList.class, AppTimeoutsInfo.class, - AppTimeoutInfo.class, ResourceInformationsInfo.class, - ActivitiesInfo.class, AppActivitiesInfo.class, - QueueAclsInfo.class, QueueAclInfo.class, - BulkActivitiesInfo.class}; - - // these dao classes need root unwrapping - final Class[] rootUnwrappedTypes = - { NewApplication.class, ApplicationSubmissionContextInfo.class, - ContainerLaunchContextInfo.class, LocalResourceInfo.class, - DelegationToken.class, AppQueue.class, AppPriority.class, - ResourceOptionInfo.class }; - - ArrayList finalcTypesList = new ArrayList<>(); - ArrayList finalRootUnwrappedTypesList = new ArrayList<>(); - - Collections.addAll(finalcTypesList, cTypes); - Collections.addAll(finalRootUnwrappedTypesList, rootUnwrappedTypes); - - // Add Custom DAO Classes - Class[] daoClasses = null; - Class[] unwrappedDaoClasses = null; - boolean loadCustom = true; - try { - daoClasses = conf - .getClasses(YarnConfiguration.YARN_HTTP_WEBAPP_CUSTOM_DAO_CLASSES); - unwrappedDaoClasses = conf.getClasses( - YarnConfiguration.YARN_HTTP_WEBAPP_CUSTOM_UNWRAPPED_DAO_CLASSES); - } catch (Exception e) { - LOG.warn("Failed to load custom dao class: ", e); - loadCustom = false; - } - - if (loadCustom) { - if (daoClasses != null) { - Collections.addAll(finalcTypesList, daoClasses); - LOG.debug("Added custom dao classes: {}.", Arrays.toString(daoClasses)); - } - if (unwrappedDaoClasses != null) { - Collections.addAll(finalRootUnwrappedTypesList, unwrappedDaoClasses); - LOG.debug("Added custom Unwrapped dao classes: {}", Arrays.toString(unwrappedDaoClasses)); - } - } - - final Class[] finalcTypes = finalcTypesList - .toArray(new Class[finalcTypesList.size()]); - final Class[] finalRootUnwrappedTypes = finalRootUnwrappedTypesList - .toArray(new Class[finalRootUnwrappedTypesList.size()]); - - this.typesContextMap = new HashMap<>(); - context = new JettisonJaxbContext(finalcTypes); - unWrappedRootContext = new JettisonJaxbContext(finalRootUnwrappedTypes); - for (Class type : finalcTypes) { - typesContextMap.put(type, context); - } - for (Class type : finalRootUnwrappedTypes) { - typesContextMap.put(type, unWrappedRootContext); - } + ClassSerialisationConfig classSerialisationConfig = new ClassSerialisationConfig(conf); + Set> wrappedClasses = classSerialisationConfig.getWrappedClasses(); + Set> unWrappedClasses = classSerialisationConfig.getUnWrappedClasses(); + + //WARNING: AFAIK these properties not respected by MOXyJsonProvider + //For details check MOXyJsonProvider#readFrom method + JAXBContext wrappedContext = JAXBContextFactory.createContext( + wrappedClasses.toArray(new Class[0]), + Collections.singletonMap(MarshallerProperties.JSON_INCLUDE_ROOT, true) + ); + JAXBContext unWrappedContext = JAXBContextFactory.createContext( + unWrappedClasses.toArray(new Class[0]), + Collections.singletonMap(MarshallerProperties.JSON_INCLUDE_ROOT, false) + ); + + wrappedClasses.forEach(type -> typesContextMap.put(type, wrappedContext)); + unWrappedClasses.forEach(type -> typesContextMap.put(type, unWrappedContext)); } @Override public JAXBContext getContext(Class objectType) { - return typesContextMap.get(objectType); + JAXBContext jaxbContext = typesContextMap.get(objectType); + LOG.trace("Context for {} is {}", objectType, jaxbContext); + return jaxbContext; } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java index b8b24a8c6422b..8619320b1d63b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java @@ -23,10 +23,13 @@ import java.net.InetSocketAddress; import org.apache.hadoop.conf.Configuration; + +import org.glassfish.jersey.moxy.json.MoxyJsonConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState; import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.util.RMHAUtils; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; @@ -60,7 +63,8 @@ public ResourceConfig resourceConfig() { config.register(new JerseyBinder()); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelsInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelsInfo.java index c9809b6d2e3cd..1ba082438ed52 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelsInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelsInfo.java @@ -32,59 +32,63 @@ public class NodeLabelsInfo { @XmlElement(name = "nodeLabelInfo") - private ArrayList nodeLabelsInfo = new ArrayList<>(); + private ArrayList nodeLabelInfo = new ArrayList<>(); public NodeLabelsInfo() { // JAXB needs this } public NodeLabelsInfo(ArrayList nodeLabels) { - this.nodeLabelsInfo = nodeLabels; + this.nodeLabelInfo = nodeLabels; } public NodeLabelsInfo(List nodeLabels) { - this.nodeLabelsInfo = new ArrayList<>(); + this.nodeLabelInfo = new ArrayList<>(); for (NodeLabel label : nodeLabels) { - this.nodeLabelsInfo.add(new NodeLabelInfo(label)); + this.nodeLabelInfo.add(new NodeLabelInfo(label)); } } - + public NodeLabelsInfo(Set nodeLabelsName) { - this.nodeLabelsInfo = new ArrayList<>(); + this.nodeLabelInfo = new ArrayList<>(); for (String labelName : nodeLabelsName) { - this.nodeLabelsInfo.add(new NodeLabelInfo(labelName)); + this.nodeLabelInfo.add(new NodeLabelInfo(labelName)); } } public NodeLabelsInfo(Collection nodeLabels) { - this.nodeLabelsInfo = new ArrayList<>(); + this.nodeLabelInfo = new ArrayList<>(); nodeLabels.stream().forEach(nodeLabel -> { - this.nodeLabelsInfo.add(new NodeLabelInfo(nodeLabel)); + this.nodeLabelInfo.add(new NodeLabelInfo(nodeLabel)); }); } public ArrayList getNodeLabelsInfo() { - return nodeLabelsInfo; + return nodeLabelInfo; } public Set getNodeLabels() { Set nodeLabels = new HashSet<>(); - for (NodeLabelInfo label : nodeLabelsInfo) { + for (NodeLabelInfo label : nodeLabelInfo) { nodeLabels.add(NodeLabel.newInstance(label.getName(), label.getExclusivity())); } return nodeLabels; } - + public List getNodeLabelsName() { ArrayList nodeLabelsName = new ArrayList<>(); - for (NodeLabelInfo label : nodeLabelsInfo) { + for (NodeLabelInfo label : nodeLabelInfo) { nodeLabelsName.add(label.getName()); } return nodeLabelsName; } public void setNodeLabelsInfo(ArrayList nodeLabelInfo) { - this.nodeLabelsInfo = nodeLabelInfo; + this.nodeLabelInfo = nodeLabelInfo; + } + + public void setNodeLabelInfo(ArrayList nodeLabelsInfo) { + this.nodeLabelInfo = nodeLabelsInfo; } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java new file mode 100644 index 0000000000000..28f9c290ae406 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java @@ -0,0 +1,247 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import javax.inject.Inject; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.util.Sets; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.UserInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ActivitiesInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppActivitiesInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppAttemptsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppPriority; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppQueue; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppTimeoutsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationStatisticsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.BulkActivitiesInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerHealthInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerQueueInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CapacitySchedulerQueueInfoList; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ConfigVersionInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ContainerLaunchContextInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FairSchedulerQueueInfoList; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.FifoSchedulerInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LocalResourceInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewApplication; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NewReservation; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodesInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.QueueAclInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.QueueAclsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteResponseInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationListInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateResponseInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInformationsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerOverviewInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.SchedulerTypeInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.StatisticsItemInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.UserMetricsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.UsersInfo; +import org.apache.hadoop.yarn.webapp.RemoteExceptionData; +import org.apache.hadoop.yarn.webapp.dao.ConfInfo; +import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo; + +/** + * Configuration holder for class serialization setup used by the ResourceManager web services layer. + * + *

This class manages two categories of data transfer objects (DTOs):

+ *
    + *
  • Wrapped classes – classes whose JSON representation includes a root wrapper element.
    • + *
  • Unwrapped classes – classes whose JSON representation omits a root wrapper element.
    • + *
+ * + *

The configuration is initialized with a default list of constant classes and may optionally + * include user-defined classes loaded from configuration properties:

+ *
    + *
  • {@code yarn.http.webapp.custom.dao.classes}
    • + *
  • {@code yarn.http.webapp.custom.unwrapped.dao.classes}
    • + *
+ * + *

This configuration is primarily used to control JSON serialization behavior in MOXy providers + * when serializing REST API objects.

+ * + *

Example:

+ *

If we have a class like:

+ * + * 
{@code
+ * @XmlRootElement(name = "foo-class")
+ * class Foo {
+ *   String a;
+ *   String b;
+ * }
+ * }
+ * + *

and the class is present in the wrapped classes list, it will be marshalled as:

+ * + * 
{@code
+ * {
+ *   "foo-class": {
+ *     "a": "...",
+ *     "b": "..."
+ *   }
+ * }
+ * }
+ * + *

or if the class is present in the unwrapped classes list, it will be marshalled as:

+ * + * 
{@code
+ * {
+ *   "a": "...",
+ *   "b": "..."
+ * }
+ * }
+ */ +public class ClassSerialisationConfig { + private static final Logger LOG = LoggerFactory.getLogger(ClassSerialisationConfig.class); + + private static final Set> CONST_WRAPPED_CLASSES = Sets.newHashSet( + ActivitiesInfo.class, + AppActivitiesInfo.class, + AppAttemptInfo.class, + AppAttemptsInfo.class, + AppInfo.class, + ApplicationStatisticsInfo.class, + AppsInfo.class, + AppTimeoutInfo.class, + AppTimeoutsInfo.class, + BulkActivitiesInfo.class, + CapacitySchedulerHealthInfo.class, + CapacitySchedulerInfo.class, + CapacitySchedulerQueueInfo.class, + CapacitySchedulerQueueInfoList.class, + ClusterInfo.class, + ClusterMetricsInfo.class, + ConfigVersionInfo.class, + FairSchedulerQueueInfoList.class, + FifoSchedulerInfo.class, + NewReservation.class, + NodeInfo.class, + NodesInfo.class, + QueueAclInfo.class, + QueueAclsInfo.class, + RemoteExceptionData.class, + ReservationDeleteRequestInfo.class, + ReservationDeleteResponseInfo.class, + ReservationSubmissionRequestInfo.class, + ReservationUpdateRequestInfo.class, + ReservationUpdateResponseInfo.class, + ResourceInfo.class, + ResourceInformationsInfo.class, + SchedulerInfo.class, + SchedulerOverviewInfo.class, + SchedulerTypeInfo.class, + StatisticsItemInfo.class, + UserInfo.class, + UserMetricsInfo.class, + UsersInfo.class + ); + + private static final Set> CONST_UNWRAPPED_CLASSES = Sets.newHashSet( + ApplicationSubmissionContextInfo.class, + AppPriority.class, + AppQueue.class, + AppState.class, + ClusterUserInfo.class, + ConfInfo.class, + ContainerLaunchContextInfo.class, + DelegationToken.class, + LabelsToNodesInfo.class, + LocalResourceInfo.class, + NewApplication.class, + NodeLabelsInfo.class, + NodeToLabelsEntryList.class, + NodeToLabelsInfo.class, + ReservationListInfo.class, + ResourceOptionInfo.class, + SchedConfUpdateInfo.class + ); + + private final Set> wrappedClasses; + private final Set> unWrappedClasses; + + public ClassSerialisationConfig() { + this(new Configuration()); + } + + @Inject + public ClassSerialisationConfig(@javax.inject.Named("conf") Configuration conf) { + wrappedClasses = new HashSet<>(CONST_WRAPPED_CLASSES); + try { + wrappedClasses.addAll(Arrays.asList(conf.getClasses(YarnConfiguration.YARN_HTTP_WEBAPP_CUSTOM_DAO_CLASSES))); + } catch (RuntimeException e) { + LOG.warn("Failed to load YARN_HTTP_WEBAPP_CUSTOM_DAO_CLASSES", e); + } + + unWrappedClasses = new HashSet<>(CONST_UNWRAPPED_CLASSES); + try { + wrappedClasses.addAll(Arrays.asList(conf.getClasses(YarnConfiguration.YARN_HTTP_WEBAPP_CUSTOM_UNWRAPPED_DAO_CLASSES))); + } catch (RuntimeException e) { + LOG.warn("Failed to load YARN_HTTP_WEBAPP_CUSTOM_DAO_CLASSES", e); + } + + LOG.trace("ClassSerialisationConfig was created, wrappedClasses: {} unWrappedClasses: {}", + wrappedClasses, unWrappedClasses); + + Set> duplicates = new HashSet<>(wrappedClasses); + duplicates.retainAll(unWrappedClasses); + + if (!duplicates.isEmpty()) { + throw new Error(String.format("Duplicate classes found: %s", duplicates)); + } + } + + public Set> getWrappedClasses() { + return wrappedClasses; + } + + public Set> getUnWrappedClasses() { + return unWrappedClasses; + } + + +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java new file mode 100644 index 0000000000000..7b4c79fc4f577 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java @@ -0,0 +1,90 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import javax.inject.Inject; +import javax.ws.rs.Consumes; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.ext.Provider; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; + +import com.google.gson.Gson; +import org.eclipse.persistence.jaxb.MarshallerProperties; +import org.eclipse.persistence.jaxb.rs.MOXyJsonProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.hadoop.conf.Configuration; + +@Provider +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +public class ExcludeRootJSONProvider extends MOXyJsonProvider { + + private final static Logger LOG = LoggerFactory.getLogger(ExcludeRootJSONProvider.class); + private final ClassSerialisationConfig classSerialisationConfig; + + public ExcludeRootJSONProvider() { + this(new Configuration()); + } + + @Inject + public ExcludeRootJSONProvider(@javax.inject.Named("conf") Configuration conf) { + classSerialisationConfig = new ClassSerialisationConfig(conf); + } + + @Override + public boolean isReadable(Class type, Type genericType, + Annotation[] annotations, MediaType mediaType) { + boolean match = classSerialisationConfig.getUnWrappedClasses().contains(type); + LOG.trace("ExcludeRootJSONProvider compatibility with {} is {}", type, match); + return match; + } + + @Override + public boolean isWriteable(Class type, Type genericType, + Annotation[] annotations, MediaType mediaType) { + return isReadable(type, genericType, annotations, mediaType); + } + + @Override + protected void preReadFrom(Class type, Type genericType, + Annotation[] annotations, MediaType mediaType, + MultivaluedMap httpHeaders, + Unmarshaller unmarshaller) throws JAXBException { + LOG.trace("ExcludeRootJSONProvider preReadFrom with {}", type); + unmarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false); + } + + @Override + protected void preWriteTo(Object object, Class type, Type genericType, + Annotation[] annotations, MediaType mediaType, + MultivaluedMap httpHeaders, Marshaller marshaller) + throws JAXBException { + LOG.trace("ExcludeRootJSONProvider preWriteTo with {}", type); + marshaller.setProperty(MarshallerProperties.JSON_MARSHAL_EMPTY_COLLECTIONS, false); + marshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false); + } +} \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java new file mode 100644 index 0000000000000..f8ce4ab8c2e28 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java @@ -0,0 +1,90 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import javax.inject.Inject; +import javax.ws.rs.Consumes; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.ext.Provider; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; + +import org.eclipse.persistence.jaxb.MarshallerProperties; +import org.eclipse.persistence.jaxb.rs.MOXyJsonProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.yarn.api.records.ResourceInformation; + +@Provider +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) +public class IncludeRootJSONProvider extends MOXyJsonProvider { + private final static Logger LOG = LoggerFactory.getLogger(IncludeRootJSONProvider.class); + private final ClassSerialisationConfig classSerialisationConfig; + + public IncludeRootJSONProvider() { + this(new Configuration()); + } + + @Inject + public IncludeRootJSONProvider(@javax.inject.Named("conf") Configuration conf) { + classSerialisationConfig = new ClassSerialisationConfig(conf); + } + + @Override + public boolean isReadable(Class type, Type genericType, + Annotation[] annotations, MediaType mediaType) { + boolean match = classSerialisationConfig.getWrappedClasses().contains(type); + LOG.trace("IncludeRootJSONProvider compatibility with {} is {}", type, match); + return match; + } + + @Override + public boolean isWriteable(Class type, Type genericType, + Annotation[] annotations, MediaType mediaType) { + return isReadable(type, genericType, annotations, mediaType); + } + + @Override + protected void preReadFrom(Class type, Type genericType, + Annotation[] annotations, MediaType mediaType, + MultivaluedMap httpHeaders, + Unmarshaller unmarshaller) throws JAXBException { + LOG.trace("IncludeRootJSONProvider preReadFrom with {}", type); + unmarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, true); + } + + @Override + protected void preWriteTo(Object object, Class type, Type genericType, + Annotation[] annotations, MediaType mediaType, + MultivaluedMap httpHeaders, Marshaller marshaller) + throws JAXBException { + LOG.trace("IncludeRootJSONProvider preWriteTo with {}", type); + marshaller.setProperty(MarshallerProperties.JSON_MARSHAL_EMPTY_COLLECTIONS, false); + marshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, true); + } + +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java new file mode 100644 index 0000000000000..8dc8b796855cb --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java @@ -0,0 +1,36 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider; + +import javax.ws.rs.core.Feature; +import javax.ws.rs.core.FeatureContext; + +import org.eclipse.persistence.jaxb.MarshallerProperties; +import org.glassfish.jersey.CommonProperties; + +public class JsonProviderFeature implements Feature { + @Override + public boolean configure(FeatureContext context) { + //Auto discovery should be disabled to ensure the custom providers will be used + context.property(CommonProperties.MOXY_JSON_FEATURE_DISABLE, true); + context.register(IncludeRootJSONProvider.class, 2001); + context.register(ExcludeRootJSONProvider.class, 2002); + return true; + } +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java index b5e41cb463510..a3e6cf99988cc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java @@ -51,6 +51,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePath; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.codehaus.jettison.json.JSONArray; @@ -84,7 +85,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -198,7 +200,10 @@ public void testAppsRunning() throws JSONException, Exception { // Verify apps resource JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject jsonObject = apps.getJSONObject("app").getJSONObject("resourceInfo"); + JSONObject jsonObject = apps + .getJSONArray("app") + .getJSONObject(0) + .getJSONObject("resourceInfo"); JSONArray jsonArray = jsonObject.getJSONArray("resourceUsagesByPartition"); assertEquals(2, jsonArray.length(), "Partition expected is 2"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java index 3ea45d1d3cd5b..d8f8bf12ce88c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java @@ -97,6 +97,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterUserInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.security.ApplicationACLsManager; import org.apache.hadoop.yarn.util.AdHocLogDumper; import org.apache.hadoop.yarn.util.AppsCacheKey; @@ -137,7 +138,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -634,7 +636,7 @@ public void verifyClusterSchedulerFifo(JSONObject json) throws JSONException, LOG.debug("schedulerInfo: {}", info); assertEquals(11, info.length(), "incorrect number of elements in: " + info); - verifyClusterSchedulerFifoGeneric(info.getString("@xsi.type"), + verifyClusterSchedulerFifoGeneric(info.getString("type"), info.getString("qstate"), (float) info.getDouble("capacity"), (float) info.getDouble("usedCapacity"), info.getInt("minQueueMemoryCapacity"), diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java index 4592d9a7585e8..b8730d0bfa3ef 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java @@ -37,6 +37,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; @@ -83,7 +84,7 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -156,9 +157,7 @@ public void testCompletedAppAttempt() throws Exception { .get(Response.class); JSONObject json = response.readEntity(JSONObject.class); JSONObject jsonAppAttempts = json.getJSONObject("appAttempts"); - JSONObject jsonAppAttempt = jsonAppAttempts.getJSONObject("appAttempt"); - JSONArray jsonArray = new JSONArray(); - jsonArray.put(jsonAppAttempt); + JSONArray jsonArray = jsonAppAttempts.getJSONArray("appAttempt"); JSONObject info = jsonArray.getJSONObject(0); String logsLink = info.getString("logsLink"); String containerId = app1.getCurrentAppAttempt().getMasterContainer() diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppCustomResourceTypes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppCustomResourceTypes.java index 947fe7a231ec4..23ad29795bd49 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppCustomResourceTypes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppCustomResourceTypes.java @@ -31,6 +31,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.util.resource.CustomResourceTypesConfigurationProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.helper.BufferedClientResponse; import org.apache.hadoop.yarn.server.resourcemanager.webapp.helper.JsonCustomResourceTypeTestcase; @@ -72,7 +73,7 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 8885540de15ed..1d87662332f91 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -44,6 +44,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; @@ -89,7 +90,7 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -280,9 +281,7 @@ public void testAppsHelper(String path, RMApp app, String media, assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject jSONObjectApp = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(jSONObjectApp); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); verifyAppInfo(array.getJSONObject(0), app, hasResourceReq); @@ -306,9 +305,7 @@ public void testAppsQueryState() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject app = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(app); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); verifyAppInfo(array.getJSONObject(0), app1, false); rm.stop(); @@ -334,9 +331,7 @@ public void testAppsQueryStates() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject app = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(app); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); assertEquals("ACCEPTED", array.getJSONObject(0).getString("state"), "state not equal to ACCEPTED"); @@ -384,9 +379,7 @@ public void testAppsQueryStatesComma() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject app = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(app); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); assertEquals("ACCEPTED", array.getJSONObject(0).getString("state"), "state not equal to ACCEPTED"); @@ -430,7 +423,7 @@ public void testAppsQueryStatesNone() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals("", json.get("apps").toString(), "apps is not empty"); + assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty"); rm.stop(); } @@ -450,7 +443,7 @@ public void testAppsQueryStateNone() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals("", json.get("apps").toString(), "apps is not empty"); + assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty"); rm.stop(); } @@ -543,9 +536,7 @@ public void testAppsQueryFinalStatus() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject app = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(app); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); verifyAppInfo(array.getJSONObject(0), app1, false); rm.stop(); @@ -566,7 +557,7 @@ public void testAppsQueryFinalStatusNone() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals("", json.get("apps").toString(), "apps is not null"); + assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not null"); rm.stop(); } @@ -719,9 +710,7 @@ public void testAppsQueryQueueAndStateOneFinishedApp() throws Exception { JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject app = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(app); + JSONArray array = apps.getJSONArray("app"); Set appIds = getApplicationIds(array); assertFalse(appIds.contains(runningApp.getApplicationId().toString()), @@ -833,9 +822,7 @@ public void testAppsQueryStartBeginSome() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject app = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(app); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); rm.stop(); } @@ -857,7 +844,7 @@ public void testAppsQueryStartEnd() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals("", json.get("apps").toString(), "apps is not empty"); + assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty"); rm.stop(); } @@ -910,9 +897,7 @@ public void testAppsQueryFinishBegin() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject appsJSONObject = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(appsJSONObject); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); rm.stop(); } @@ -981,9 +966,7 @@ public void testAppsQueryFinishBeginEnd() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject appsJSONObject = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(appsJSONObject); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); rm.stop(); } @@ -1033,9 +1016,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject appsJSONObject = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(appsJSONObject); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); assertEquals("MAPREDUCE", array.getJSONObject(0).getString("applicationType")); @@ -1120,9 +1101,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - appsJSONObject = apps.getJSONObject("app"); - array = new JSONArray(); - array.put(appsJSONObject); + array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); assertEquals("YARN", array.getJSONObject(0).getString("applicationType")); @@ -1138,9 +1117,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - appsJSONObject = apps.getJSONObject("app"); - array = new JSONArray(); - array.put(appsJSONObject); + array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); assertEquals("YARN", array.getJSONObject(0).getString("applicationType")); @@ -1255,9 +1232,7 @@ public void testAppsQueryWithDeselects() assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - JSONObject appsJSONObject = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(appsJSONObject); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); JSONObject app = array.getJSONObject(0); assertTrue(!app.has("resourceRequests"), "resource requests shouldn't exist"); @@ -1272,9 +1247,7 @@ public void testAppsQueryWithDeselects() assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - appsJSONObject = apps.getJSONObject("app"); - array = new JSONArray(); - array.put(appsJSONObject); + array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); app = array.getJSONObject(0); assertTrue(!app.has("amNodeLabelExpression"), @@ -1290,9 +1263,7 @@ public void testAppsQueryWithDeselects() assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - appsJSONObject = apps.getJSONObject("app"); - array = new JSONArray(); - array.put(appsJSONObject); + array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); app = array.getJSONObject(0); assertTrue(!app.has("timeouts"), "Timeouts shouldn't exist"); @@ -1309,9 +1280,7 @@ public void testAppsQueryWithDeselects() assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - appsJSONObject = apps.getJSONObject("app"); - array = new JSONArray(); - array.put(appsJSONObject); + array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); app = array.getJSONObject(0); assertTrue(!app.has("appNodeLabelExpression"), "AppNodeLabelExpression shouldn't exist"); @@ -1328,9 +1297,7 @@ public void testAppsQueryWithDeselects() assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); - appsJSONObject = apps.getJSONObject("app"); - array = new JSONArray(); - array.put(appsJSONObject); + array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect number of elements"); app = array.getJSONObject(0); assertTrue(!app.has("resourceInfo"), "Resource info shouldn't exist"); @@ -1421,9 +1388,7 @@ public void testAppStatistics() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); appsStatInfo = json.getJSONObject("appStatInfo"); assertEquals(1, appsStatInfo.length(), "incorrect number of elements"); - JSONObject statItem = appsStatInfo.getJSONObject("statItem"); - statItems = new JSONArray(); - statItems.put(statItem); + statItems = appsStatInfo.getJSONArray("statItem"); assertEquals(1, statItems.length(), "incorrect number of elements"); assertEquals("ACCEPTED", statItems.getJSONObject(0).getString("state")); assertEquals("*", statItems.getJSONObject(0).getString("type")); @@ -1789,7 +1754,7 @@ public void verifyAppsXML(NodeList nodes, RMApp app, boolean hasResourceReq) public void verifyAppInfo(JSONObject info, RMApp app, boolean hasResourceReqs) throws JSONException, Exception { - int expectedNumberOfElements = 41 + (hasResourceReqs ? 2 : 0); + int expectedNumberOfElements = 40 + (hasResourceReqs ? 2 : 0); String appNodeLabelExpression = null; String amNodeLabelExpression = null; if (app.getApplicationSubmissionContext() @@ -1836,10 +1801,8 @@ public void verifyAppInfo(JSONObject info, RMApp app, boolean hasResourceReqs) amRPCAddress); if (hasResourceReqs) { - JSONObject resourceRequests = info.getJSONObject("resourceRequests"); - JSONArray array = new JSONArray(); - array.put(resourceRequests); - verifyResourceRequests(array, app); + JSONArray resourceRequests = info.getJSONArray("resourceRequests"); + verifyResourceRequests(resourceRequests, app); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsCustomResourceTypes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsCustomResourceTypes.java index f1c8dd3137e58..ccdcd29bc01a0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsCustomResourceTypes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsCustomResourceTypes.java @@ -34,6 +34,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.util.resource.CustomResourceTypesConfigurationProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.helper.BufferedClientResponse; import org.apache.hadoop.yarn.server.resourcemanager.webapp.helper.JsonCustomResourceTypeTestcase; @@ -79,7 +80,7 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -174,9 +175,7 @@ public void testRunningAppsJson() throws Exception { assertEquals(1, json.length(), "incorrect number of apps elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of app elements"); - JSONObject app = apps.getJSONObject("app"); - JSONArray array = new JSONArray(); - array.put(app); + JSONArray array = apps.getJSONArray("app"); assertEquals(1, array.length(), "incorrect count of app"); verifyAppInfoJson(array.getJSONObject(0), app1, rm); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index a28e0e9084412..d5422d3b92615 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.File; import java.io.IOException; @@ -105,6 +106,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CredentialsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LocalResourceInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LogAggregationContextInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.AppStateReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; @@ -112,6 +115,9 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; + +import com.google.gson.Gson; +import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.junit.jupiter.api.AfterEach; @@ -159,55 +165,14 @@ public class TestRMWebServicesAppsModification extends JerseyTestBase { private HttpServletRequest hsRequest = mock(HttpServletRequest.class); private HttpServletResponse hsResponse = mock(HttpServletResponse.class); - private static final JettisonMarshaller APP_STATE_WRITER; - static { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(AppState.class); - APP_STATE_WRITER = jettisonJaxbContext.createJsonMarshaller(); - } catch (JAXBException e) { - throw new RuntimeException(e); - } - } - - private static final JettisonMarshaller APP_PRIORITY_WRITER; - static { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(AppPriority.class); - APP_PRIORITY_WRITER = jettisonJaxbContext.createJsonMarshaller(); - } catch (JAXBException e) { - throw new RuntimeException(e); - } - } - - private static final JettisonMarshaller APP_QUEUE_WRITER; - static { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(AppQueue.class); - APP_QUEUE_WRITER = jettisonJaxbContext.createJsonMarshaller(); - } catch (JAXBException e) { - throw new RuntimeException(e); - } - } - - private static final JettisonMarshaller APP_TIMEOUT_WRITER; - static { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(AppTimeoutInfo.class); - APP_TIMEOUT_WRITER = jettisonJaxbContext.createJsonMarshaller(); - } catch (JAXBException e) { - throw new RuntimeException(e); - } - } - @Override protected Application configure() { config = new ResourceConfig(); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(ApplicationSubmissionContextInfoWriter.class); - config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -378,11 +343,7 @@ private WebTarget constructWebResource(WebTarget r, String... paths) { } private WebTarget constructWebResource(String... paths) { - WebTarget r = target() - .register(App.class) - .register(AppStateReader.class) - .register(ApplicationSubmissionContextInfoReader.class) - .register(ApplicationSubmissionContextInfoWriter.class); + WebTarget r = target().register(App.class); WebTarget ws = r.path("ws").path("v1").path("cluster"); return this.constructWebResource(ws, paths); } @@ -565,9 +526,7 @@ public void testSingleAppKillInvalidState(int run) throws Exception { } private static String appStateToJSON(AppState state) throws Exception { - StringWriter stringWriter = new StringWriter(); - APP_STATE_WRITER.marshallToJSON(state, stringWriter); - return stringWriter.toString(); + return new Gson().toJson(state); } protected static void verifyAppStateJson(Response response, @@ -577,7 +536,7 @@ protected static void verifyAppStateJson(Response response, response.getMediaType().toString()); JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); - String responseState = json.getJSONObject("appstate").getString("state"); + String responseState = json.getString("state"); boolean valid = false; for (RMAppState state : states) { if (state.toString().equals(responseState)) { @@ -774,8 +733,7 @@ protected String validateGetNewApplicationResponse(Response resp) String ret = ""; if (resp.getMediaType().toString().contains(MediaType.APPLICATION_JSON)) { JSONObject json = resp.readEntity(JSONObject.class); - JSONObject newApplication = json.getJSONObject("NewApplication"); - ret = validateGetNewApplicationJsonResponse(newApplication); + ret = validateGetNewApplicationJsonResponse(json); } else if (resp.getMediaType().toString().contains(MediaType.APPLICATION_XML)) { String xml = resp.readEntity(String.class); ret = validateGetNewApplicationXMLResponse(xml); @@ -938,10 +896,11 @@ public void testAppSubmit(String acceptMedia, String contentMedia) String reservationId = ReservationId.newInstance( System.currentTimeMillis(), 1).toString(); appInfo.setReservationId(reservationId); + Entity entity = Entity.entity(appInfo, contentMedia); Response response = this.constructWebResource(urlPath).request(acceptMedia) - .post(Entity.entity(appInfo, contentMedia), Response.class); + .post(entity, Response.class); if (!this.isAuthenticationEnabled()) { assertResponseStatusCode(Response.Status.UNAUTHORIZED, response.getStatusInfo()); @@ -1336,15 +1295,11 @@ public void testAppMove(int run) throws Exception { protected static String appPriorityToJSON(AppPriority targetPriority) throws Exception { - StringWriter stringWriter = new StringWriter(); - APP_PRIORITY_WRITER.marshallToJSON(targetPriority, stringWriter); - return stringWriter.toString(); + return new Gson().toJson(targetPriority); } protected static String appQueueToJSON(AppQueue targetQueue) throws Exception { - StringWriter stringWriter = new StringWriter(); - APP_QUEUE_WRITER.marshallToJSON(targetQueue, stringWriter); - return stringWriter.toString(); + return new Gson().toJson(targetQueue); } protected static void verifyAppPriorityJson(Response response, @@ -1353,8 +1308,7 @@ protected static void verifyAppPriorityJson(Response response, response.getMediaType().toString()); JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); - JSONObject applicationpriority = json.getJSONObject("applicationpriority"); - int responsePriority = applicationpriority.getInt("priority"); + int responsePriority = json.getInt("priority"); assertEquals(expectedPriority, responsePriority); } @@ -1382,7 +1336,7 @@ protected static void verifyAppQueueJson(Response response, String queue) response.getMediaType().toString()); JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); - String responseQueue = json.getJSONObject("appqueue").getString("queue"); + String responseQueue = json.getString("queue"); assertEquals(queue, responseQueue); } @@ -1433,8 +1387,8 @@ public void testUpdateAppTimeout(int run) throws Exception { response.getMediaType().toString()); JSONObject js = response.readEntity(JSONObject.class).getJSONObject("timeouts"); - JSONObject entity = js.getJSONObject("timeout"); - verifyAppTimeoutJson(entity, + JSONArray entity = js.getJSONArray("timeout"); + verifyAppTimeoutJson(entity.getJSONObject(0), ApplicationTimeoutType.LIFETIME, "UNLIMITED", -1); } @@ -1454,6 +1408,7 @@ public void testUpdateAppTimeout(int run) throws Exception { response.getStatusInfo()); continue; } + assertResponseStatusCode(Response.Status.OK, response.getStatusInfo()); if (mediaType.contains(MediaType.APPLICATION_JSON)) { verifyAppTimeoutJson(response, ApplicationTimeoutType.LIFETIME, @@ -1548,7 +1503,9 @@ protected static void verifyAppTimeoutXML(Response response, protected static String appTimeoutToJSON(AppTimeoutInfo timeout) throws Exception { StringWriter stringWriter = new StringWriter(); - APP_TIMEOUT_WRITER.marshallToJSON(timeout, stringWriter); + JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(AppTimeoutInfo.class); + JettisonMarshaller jettisonMarshaller = jettisonJaxbContext.createJsonMarshaller(); + jettisonMarshaller.marshallToJSON(timeout, stringWriter); return stringWriter.toString(); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index 3e9f7f30ea61d..6fd3721209573 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -31,6 +31,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -81,7 +82,7 @@ protected Application configure() { config.register(ApplicationSubmissionContextInfoWriter.class); config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDefaultLabel.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDefaultLabel.java index 49c5f9f46f95d..1a881540f7acd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDefaultLabel.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDefaultLabel.java @@ -24,6 +24,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePath; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -72,7 +73,7 @@ protected Application configure() { config.register(ApplicationSubmissionContextInfoWriter.class); config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java index 042defbc6f358..8e0d417e6433d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java @@ -25,6 +25,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -94,7 +95,8 @@ protected Application configure() { config.register(ApplicationSubmissionContextInfoWriter.class); config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigAbsoluteMode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigAbsoluteMode.java index 2e16928ab97bf..84b170cdf6184 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigAbsoluteMode.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigAbsoluteMode.java @@ -24,6 +24,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -91,10 +92,9 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(ApplicationSubmissionContextInfoWriter.class); - config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightMode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightMode.java index 586954be7e8b6..d6072e4b5beff 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightMode.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightMode.java @@ -24,6 +24,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -93,7 +94,8 @@ protected Application configure() { config.register(ApplicationSubmissionContextInfoWriter.class); config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightModeDQC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightModeDQC.java index 563d888a5752c..333a6e95cdcbd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightModeDQC.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightModeDQC.java @@ -26,6 +26,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerQueueManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePath; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -104,7 +105,8 @@ protected Application configure() { config.register(ApplicationSubmissionContextInfoWriter.class); config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreation.java index 2b00bb99c469d..561ce51d2bc38 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreation.java @@ -31,6 +31,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -73,7 +74,8 @@ protected Application configure() { config.register(ApplicationSubmissionContextInfoWriter.class); config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreationAbsoluteMode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreationAbsoluteMode.java index ee85faa00c5ac..87b4171fc5ec4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreationAbsoluteMode.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreationAbsoluteMode.java @@ -25,6 +25,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerQueueManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePath; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; @@ -72,7 +73,7 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java index a470bcb8c077d..773e81dfaeee5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java @@ -36,6 +36,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.SchedConfUpdateInfoWriter; @@ -83,11 +84,9 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(ApplicationSubmissionContextInfoWriter.class); - config.register(SchedConfUpdateInfoWriter.class); - config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } @@ -161,7 +160,7 @@ public void testUpdateAbsoluteHierarchyWithZeroCapacities(boolean pLegacyQueueMo QueueConfigInfo b = new QueueConfigInfo("root.a", capacityChange); updateInfo.getUpdateQueueInfo().add(b); - Response response = target().register(SchedConfUpdateInfoWriter.class) + Response response = target() .path("ws/v1/cluster/scheduler-conf") .queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedMode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedMode.java index 8141cee7e81b8..4034d3ded9610 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedMode.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedMode.java @@ -24,6 +24,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; @@ -79,7 +80,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentage.java index 4782b44c1275a..dea9d31ee7779 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentage.java @@ -20,6 +20,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; @@ -79,7 +80,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeight.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeight.java index a300c10f33f30..2d4325fd4344c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeight.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeight.java @@ -20,6 +20,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; @@ -78,7 +79,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeightVector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeightVector.java index a1cc259060e38..22ab95418f33c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeightVector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeightVector.java @@ -20,6 +20,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; @@ -78,7 +79,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageVector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageVector.java index 0829f24d545ff..89aee88f92d4c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageVector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageVector.java @@ -20,6 +20,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; @@ -78,7 +79,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeight.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeight.java index 40cc024052d3a..aba0732574c79 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeight.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeight.java @@ -20,6 +20,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; @@ -78,7 +79,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeightVector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeightVector.java index 71c2cb5bb69b2..968c48ed3abcc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeightVector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeightVector.java @@ -20,6 +20,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; @@ -78,7 +79,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeight.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeight.java index 25ba549f7f22e..6c202dbea6c7d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeight.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeight.java @@ -20,6 +20,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; @@ -77,7 +78,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeightVector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeightVector.java index 058acf8080b06..96a419a339130 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeightVector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeightVector.java @@ -20,6 +20,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.server.resourcemanager.MockRM; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; @@ -78,7 +79,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java index 5ddaf054be4e8..bd11e1accdc2f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java @@ -19,7 +19,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.http.JettyUtils; @@ -36,8 +35,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePrefixes; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.NodeLabelsInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.SchedConfUpdateInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.dao.QueueConfigInfo; @@ -75,7 +74,7 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.getCapacitySchedulerConfigFileInTarget; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.backupSchedulerConfigFileInTarget; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.restoreSchedulerConfigFileInTarget; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJsonNoRoot; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -112,7 +111,8 @@ protected Application configure() { config.register(GenericExceptionHandler.class); config.register(NodeLabelsInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } @@ -207,8 +207,7 @@ private CapacitySchedulerConfiguration getSchedulerConf() .request(MediaType.APPLICATION_JSON) .get(Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); - JSONObject json = response.readEntity(JSONObject.class). - getJSONObject("configuration"); + JSONObject json = response.readEntity(JSONObject.class); JSONArray items = (JSONArray) json.get("property"); CapacitySchedulerConfiguration parsedConf = new CapacitySchedulerConfiguration(); @@ -248,7 +247,7 @@ public void testFormatSchedulerConf() throws Exception { updateInfo.getUpdateQueueInfo().add(stoppedInfo); // Add a queue root.formattest to the existing three queues - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response = r.path("ws").path("v1").path("cluster") .path("scheduler-conf").queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) @@ -293,7 +292,7 @@ public void testAddNestedQueue() throws Exception { assertNotNull(orgConf); assertEquals(4, orgConf.getQueues(ROOT).size()); - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -338,7 +337,7 @@ public void testAddNestedQueue() throws Exception { @Test public void testAddWithUpdate() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -368,7 +367,7 @@ public void testAddWithUpdate() throws Exception { @Test public void testUnsetParentQueueOrderingPolicy() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; // Update ordering policy of Leaf Queue root.b to fair @@ -415,7 +414,7 @@ public void testUnsetParentQueueOrderingPolicy() throws Exception { @Test public void testUnsetLeafQueueOrderingPolicy() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; // Update ordering policy of Parent Queue root.c to priority-utilization @@ -459,7 +458,7 @@ public void testUnsetLeafQueueOrderingPolicy() throws Exception { @Test public void testRemoveQueue() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -485,7 +484,7 @@ public void testRemoveQueue() throws Exception { @Test public void testStopWithRemoveQueue() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -514,7 +513,7 @@ public void testStopWithRemoveQueue() throws Exception { @Test public void testRemoveQueueWhichHasQueueMapping() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; CapacityScheduler cs = (CapacityScheduler) rm.getResourceScheduler(); @@ -553,7 +552,7 @@ public void testRemoveQueueWhichHasQueueMapping() throws Exception { @Test public void testStopWithConvertLeafToParentQueue() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; // Set state of queues to STOPPED. @@ -584,7 +583,7 @@ public void testStopWithConvertLeafToParentQueue() throws Exception { @Test public void testRemoveParentQueue() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -607,7 +606,7 @@ public void testRemoveParentQueue() throws Exception { @Test public void testRemoveParentQueueWithCapacity() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -637,7 +636,7 @@ public void testRemoveParentQueueWithCapacity() throws Exception { @Test public void testRemoveMultipleQueues() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -664,7 +663,7 @@ public void testRemoveMultipleQueues() throws Exception { } private void stopQueue(QueuePath... queuePaths) throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -692,7 +691,7 @@ private void stopQueue(QueuePath... queuePaths) throws Exception { @Test public void testUpdateQueue() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -743,7 +742,7 @@ public void testUpdateQueue() throws Exception { @Test public void testUpdateQueueCapacity() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -770,7 +769,7 @@ public void testUpdateQueueCapacity() throws Exception { @Test public void testGlobalConfChange() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); Response response; @@ -805,9 +804,10 @@ public void testGlobalConfChange() throws Exception { newCSConf.getMaximumSystemApplications()); } + //TODO: fix, some missing label @Test public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { - WebTarget r = target().register(NodeLabelsInfoReader.class); + WebTarget r = target(); Response response; // 1. Create Node Label: label1 @@ -824,7 +824,7 @@ public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { response = addNodeLabelsResource.queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) .post(Entity.entity(logAndReturnJson(addNodeLabelsResource, - toJson(nodeLabelsInfo, NodeLabelsInfo.class)), MediaType.APPLICATION_JSON), Response.class); + toJsonNoRoot(nodeLabelsInfo, NodeLabelsInfo.class)), MediaType.APPLICATION_JSON), Response.class); // 2. Verify new Node Label response = getNodeLabelsResource.queryParam("user.name", userName) @@ -854,7 +854,7 @@ public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { response = schedulerConfResource .queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) - .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJson(updateInfo, + .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJsonNoRoot(updateInfo, SchedConfUpdateInfo.class)), MediaType.APPLICATION_JSON), Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); @@ -901,7 +901,7 @@ public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { response = schedulerConfResource .queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) - .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJson(updateInfo, + .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJsonNoRoot(updateInfo, SchedConfUpdateInfo.class)), MediaType.APPLICATION_JSON), Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); @@ -953,7 +953,7 @@ public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { response = schedulerConfResource .queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) - .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJson(updateInfo, + .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJsonNoRoot(updateInfo, SchedConfUpdateInfo.class)), MediaType.APPLICATION_JSON), Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); assertEquals(Sets.newHashSet("*"), @@ -1010,7 +1010,7 @@ private String getAccessibleNodeLabelsMaxCapacityPropertyName(String label) { @Test public void testValidateWithClusterMaxAllocation() throws Exception { - WebTarget r = target().register(SchedConfUpdateInfoWriter.class); + WebTarget r = target(); int clusterMax = YarnConfiguration. DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB * 2; conf.setInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesContainers.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesContainers.java index 4869cdd4c5221..d9158f00a1c33 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesContainers.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesContainers.java @@ -46,6 +46,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -75,7 +76,8 @@ protected Application configure() { config.register(ApplicationSubmissionContextInfoWriter.class); config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCustomResourceTypesCommons.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCustomResourceTypesCommons.java index 3307056dee150..bbd5a5c71d100 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCustomResourceTypesCommons.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCustomResourceTypesCommons.java @@ -93,7 +93,7 @@ public static JSONArray parseResourceRequests(JSONObject info) throws JSONExcept } static int getExpectedNumberOfElements(RMApp app) { - int expectedNumberOfElements = 40 + 2; // 2 -> resourceRequests + int expectedNumberOfElements = 39 + 2; // 2 -> resourceRequests if (app.getApplicationSubmissionContext() .getNodeLabelExpression() != null) { expectedNumberOfElements++; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokenAuthentication.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokenAuthentication.java index c813f477f9d88..37c273aadb666 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokenAuthentication.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokenAuthentication.java @@ -18,7 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJsonNoRoot; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -311,11 +311,11 @@ public void testDelegationTokenOps(String header) throws Exception { DelegationToken createRequestToken = new DelegationToken(); createRequestToken.setRenewer("test"); String createRequest = - toJson(createRequestToken, DelegationToken.class); + toJsonNoRoot(createRequestToken, DelegationToken.class); DelegationToken renewRequestToken = new DelegationToken(); renewRequestToken.setToken(token); String renewRequest = - toJson(renewRequestToken, DelegationToken.class); + toJsonNoRoot(renewRequestToken, DelegationToken.class); // first test create and renew String[] requests = { createRequest, renewRequest }; @@ -363,7 +363,7 @@ public Void call() throws Exception { String renewer = "renewer"; DelegationToken token2 = new DelegationToken(); token2.setRenewer(renewer); - String body = toJson(token2, DelegationToken.class); + String body = toJsonNoRoot(token2, DelegationToken.class); URL url = new URL("http://localhost:8088/ws/v1/cluster/delegation-token?doAs=client2"); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); @@ -374,7 +374,7 @@ public Void call() throws Exception { try { reader = new BufferedReader(new InputStreamReader(response, StandardCharsets.UTF_8)); for (String line; (line = reader.readLine()) != null;) { - JSONObject obj = new JSONObject(line).getJSONObject("delegation-token"); + JSONObject obj = new JSONObject(line); if (obj.has("token")) { token = obj.getString("token"); } @@ -399,7 +399,7 @@ public Void call() throws Exception { String renewer = "renewer"; DelegationToken token2 = new DelegationToken(); token2.setRenewer(renewer); - String body = toJson(token2, DelegationToken.class); + String body = toJsonNoRoot(token2, DelegationToken.class); URL url = new URL("http://localhost:8088/ws/v1/cluster/delegation-token?doAs=client2"); @@ -445,7 +445,7 @@ public String call() throws Exception { String ret = null; DelegationToken token = new DelegationToken(); token.setRenewer(renewer); - String body = toJson(token, DelegationToken.class); + String body = toJsonNoRoot(token, DelegationToken.class); URL url = new URL("http://localhost:8088/ws/v1/cluster/delegation-token"); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); @@ -457,7 +457,7 @@ public String call() throws Exception { String line; while ((line = reader.readLine()) != null) { String dtoken = line; - JSONObject obj = new JSONObject(dtoken).getJSONObject("delegation-token"); + JSONObject obj = new JSONObject(dtoken); if (obj.has("token")) { reader.close(); response.close(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java index 45b7cd3952579..3134fadc259ec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java @@ -63,6 +63,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.DelegationToken; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; @@ -85,10 +86,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJsonNoRoot; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toEntity; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.server.ResourceConfig; @@ -111,7 +111,8 @@ protected Application configure() { config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); return config; } @@ -278,7 +279,7 @@ public void testCreateDelegationToken(int run) throws Exception { final String renewer = "test-renewer"; DelegationToken token = new DelegationToken(); token.setRenewer(renewer); - String jsonBody = toJson(token, DelegationToken.class); + String jsonBody = toJsonNoRoot(token, DelegationToken.class); String xmlBody = "" + renewer + ""; @@ -477,7 +478,7 @@ public Void call() throws Exception { if (mediaType.equals(MediaType.APPLICATION_JSON)) { DelegationToken dToken = new DelegationToken(); dToken.setToken(token); - body = toJson(dToken, DelegationToken.class); + body = toJsonNoRoot(dToken, DelegationToken.class); } else { body = "" + token @@ -510,7 +511,7 @@ private void verifySimpleAuthRenew(String mediaType, String contentType) throws DelegationToken delegationToken = new DelegationToken(); body = "{\"token\": \"" + token + "\" }"; delegationToken.setToken("test-123"); - body = toJson(delegationToken, DelegationToken.class); + body = toJsonNoRoot(delegationToken, DelegationToken.class); } else { body = "" + token + ""; @@ -748,7 +749,7 @@ private void verifySimpleAuthCancel() { JSONException { if (response.getMediaType().toString().contains(MediaType.APPLICATION_JSON)) { return getDelegationTokenFromJson( - response.readEntity(JSONObject.class).getJSONObject("delegation-token")); + response.readEntity(JSONObject.class)); } return getDelegationTokenFromXML(response.readEntity(String.class)); } @@ -822,7 +823,7 @@ private static String generateRenewTokenBody(String mediaType, String token) if (mediaType.contains(MediaType.APPLICATION_JSON)) { DelegationToken dToken = new DelegationToken(); dToken.setToken(token); - body = toJson(dToken, DelegationToken.class); + body = toJsonNoRoot(dToken, DelegationToken.class); } else { body = "" + token + ""; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java index 3d42dd8c9b1fc..dcfd79fdc900e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java @@ -71,6 +71,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityState; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePath; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.util.resource.Resources; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; @@ -130,7 +131,8 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java index d04488d871df2..76b00d109d9a7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java @@ -46,6 +46,8 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.Lists; + +import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.http.JettyUtils; @@ -59,6 +61,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntry; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.NodeLabelsInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.LabelsToNodesInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.NodeToLabelsInfoReader; @@ -121,8 +126,8 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(NodeLabelsInfoReader.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -167,9 +172,6 @@ public TestRMWebServicesNodeLabels() { private WebTarget getClusterWebResource() { return targetWithJsonObject(). - register(NodeLabelsInfoReader.class). - register(LabelsToNodesInfoReader.class). - register(NodeToLabelsInfoReader.class). path(PATH_WS).path(PATH_V1).path(PATH_CLUSTER); } @@ -703,10 +705,6 @@ private String toJson(Object obj, Class klass) throws Exception { if (obj == null) { return null; } - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(klass); - JettisonMarshaller jsonMarshaller = jettisonJaxbContext.createJsonMarshaller(); - StringWriter stringWriter = new StringWriter(); - jsonMarshaller.marshallToJSON(obj, stringWriter); - return stringWriter.toString(); + return new Gson().toJson(obj, klass); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index aa3157b5d0679..fa64a2bf47eaf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -88,6 +88,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ResourceOptionInfoReader; import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ResourceOptionInfoWriter; import org.apache.hadoop.yarn.util.Records; @@ -127,7 +128,8 @@ protected Application configure() { config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); config.register(TestRMCustomAuthFilter.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -292,10 +294,7 @@ public void testNodesQueryNew() throws Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); - JSONObject node = nodes.getJSONObject("node"); - JSONArray nodeArray = new JSONArray(); - nodeArray.put(node); - + JSONArray nodeArray = nodes.getJSONArray("node"); assertEquals(1, nodeArray.length(), "incorrect number of elements"); JSONObject info = nodeArray.getJSONObject(0); @@ -316,7 +315,7 @@ public void testNodesQueryStateNone() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals("", json.get("nodes").toString(), "nodes is not empty"); + assertEquals(new JSONObject().toString(), json.get("nodes").toString(), "nodes is not empty"); } @Test @@ -428,9 +427,7 @@ public void testNodesQueryRunning() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); - JSONObject node = nodes.getJSONObject("node"); - JSONArray nodeArray = new JSONArray(); - nodeArray.put(node); + JSONArray nodeArray = nodes.getJSONArray("node"); assertEquals(1, nodeArray.length(), "incorrect number of elements"); } @@ -447,7 +444,7 @@ public void testNodesQueryHealthyFalse() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals("", json.get("nodes").toString(), "nodes is not empty"); + assertEquals(new JSONObject().toString(), json.get("nodes").toString(), "nodes is not empty"); } public void testNodesHelper(String path, String media) throws JSONException, @@ -739,9 +736,7 @@ public void testNodesResourceUtilization() throws JSONException, Exception { assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); - JSONObject jsonNode = nodes.getJSONObject("node"); - JSONArray nodeArray = new JSONArray(); - nodeArray.put(jsonNode); + JSONArray nodeArray = nodes.getJSONArray("node"); assertEquals(1, nodeArray.length(), "incorrect number of elements"); JSONObject info = nodeArray.getJSONObject(0); @@ -752,8 +747,6 @@ public void testNodesResourceUtilization() throws JSONException, Exception { @Test public void testUpdateNodeResource() throws Exception { WebTarget r = targetWithJsonObject() - .register(ResourceOptionInfoReader.class) - .register(ResourceOptionInfoWriter.class) .path(RMWSConsts.RM_WEB_SERVICE_PATH); r = r.queryParam("user.name", userName); @@ -1023,10 +1016,8 @@ public void testNodeAttributesInfo() throws Exception { String entity = response.readEntity(String.class); JSONObject nodesInfoJson = new JSONObject(entity); - JSONObject jsonNodes = nodesInfoJson.getJSONObject("nodes"); - JSONObject jsonNode = jsonNodes.getJSONObject("node"); - JSONArray nodes = new JSONArray(); - nodes.put(jsonNode); + JSONArray nodes = nodesInfoJson.getJSONObject("nodes") + .getJSONArray("node"); JSONObject nodeJson = nodes.getJSONObject(0); JSONArray nodeAttributesInfo = nodeJson.getJSONObject("nodeAttributesInfo") .getJSONArray("nodeAttributeInfo"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index 1d8c6bab87f19..263d60a88096e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -18,7 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJsonRoot; import static org.assertj.core.api.Assertions.assertThat; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -71,6 +71,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationDeleteRequestInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationSubmissionRequestInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ReservationUpdateRequestInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.UTCClock; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -82,7 +83,6 @@ import org.junit.jupiter.api.AfterEach; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.jettison.JettisonJaxbContext; import org.glassfish.jersey.jettison.JettisonUnmarshaller; import org.glassfish.jersey.server.ResourceConfig; @@ -162,7 +162,8 @@ protected Application configure() { if (setAuthFilter) { config.register(TestRMCustomAuthFilter.class); } - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -480,9 +481,7 @@ public void testTimeIntervalRequestListReservation(int run, boolean recurrence) return; } - JSONObject reservations = json. - getJSONObject("reservationListInfo"). - getJSONObject("reservations"); + JSONObject reservations = json.getJSONArray("reservations").getJSONObject(0); testRDLHelper(reservations); @@ -530,8 +529,7 @@ public void testSameTimeIntervalRequestListReservation(int run, boolean recurren return; } - JSONObject reservations = - json.getJSONObject("reservationListInfo").getJSONObject("reservations"); + JSONObject reservations = json.getJSONArray("reservations").getJSONObject(0); testRDLHelper(reservations); @@ -573,9 +571,7 @@ public void testInvalidTimeIntervalRequestListReservation(int run, boolean recur return; } - JSONArray reservations = json. - getJSONObject("reservationListInfo"). - getJSONArray("reservations"); + JSONArray reservations = json.getJSONArray("reservations"); assertEquals(2, reservations.length()); @@ -619,8 +615,8 @@ public void testInvalidEndTimeRequestListReservation(int run, boolean recurrence if (!enableRecurrence) { JSONObject reservations = json. - getJSONObject("reservationListInfo"). - getJSONObject("reservations"); + getJSONArray("reservations") + .getJSONObject(0); testRDLHelper(reservations); @@ -633,7 +629,7 @@ public void testInvalidEndTimeRequestListReservation(int run, boolean recurrence // picked up by the search interval since it is greater than the period // of the reservation. JSONArray reservations = - json.getJSONObject("reservationListInfo").getJSONArray("reservations"); + json.getJSONArray("reservations"); assertEquals(2, reservations.length()); } @@ -671,8 +667,7 @@ public void testEmptyEndTimeRequestListReservation(int run, boolean recurrence) } if (!enableRecurrence) { - JSONObject reservations = json. - getJSONObject("reservationListInfo").getJSONObject("reservations"); + JSONObject reservations = json.getJSONArray("reservations").getJSONObject(0); testRDLHelper(reservations); @@ -685,7 +680,7 @@ public void testEmptyEndTimeRequestListReservation(int run, boolean recurrence) // picked up by the search interval since it is greater than the period // of the reservation. JSONArray reservations = - json.getJSONObject("reservationListInfo").getJSONArray("reservations"); + json.getJSONArray("reservations"); assertEquals(2, reservations.length()); } @@ -724,9 +719,7 @@ public void testInvalidStartTimeRequestListReservation(int run, boolean recurren return; } - JSONObject reservations = json. - getJSONObject("reservationListInfo"). - getJSONObject("reservations"); + JSONObject reservations = json.getJSONArray("reservations").getJSONObject(0); testRDLHelper(reservations); @@ -770,8 +763,7 @@ public void testEmptyStartTimeRequestListReservation(int run, boolean recurrence return; } - JSONObject reservations = json. - getJSONObject("reservationListInfo").getJSONObject("reservations"); + JSONObject reservations = json.getJSONArray("reservations").getJSONObject(0); testRDLHelper(reservations); @@ -807,12 +799,9 @@ public void testQueueOnlyRequestListReservation(int run, boolean recurrence) thr return; } - assertThat(json.getJSONObject("reservationListInfo") - .getJSONArray("reservations").length()).isEqualTo(2); - testRDLHelper(json.getJSONObject("reservationListInfo") - .getJSONArray("reservations").getJSONObject(0)); - testRDLHelper(json.getJSONObject("reservationListInfo") - .getJSONArray("reservations").getJSONObject(1)); + assertThat(json.getJSONArray("reservations").length()).isEqualTo(2); + testRDLHelper(json.getJSONArray("reservations").getJSONObject(0)); + testRDLHelper(json.getJSONArray("reservations").getJSONObject(1)); rm.stop(); } @@ -895,9 +884,7 @@ public void testReservationIdRequestListReservation(int run, boolean recurrence) return; } - JSONObject reservations = json. - getJSONObject("reservationListInfo"). - getJSONObject("reservations"); + JSONObject reservations = json.getJSONArray("reservations").getJSONObject(0); testRDLHelper(reservations); @@ -959,7 +946,7 @@ public void testIncludeResourceAllocations(int run, boolean recurrence) throws E } JSONObject reservations = - json.getJSONObject("reservationListInfo").getJSONObject("reservations"); + json.getJSONArray("reservations").getJSONObject(0); testRDLHelper(reservations); @@ -998,8 +985,8 @@ public void testExcludeResourceAllocations(int run, boolean recurrence) throws E } JSONObject reservations = json. - getJSONObject("reservationListInfo"). - getJSONObject("reservations"); + getJSONArray("reservations") + .getJSONObject(0); testRDLHelper(reservations); @@ -1061,7 +1048,6 @@ private ReservationId getReservationIdTestHelper(int fallbackReservationId) return ReservationId.newInstance(clock.getTime(), fallbackReservationId); } - System.out.println("RESPONSE:" + response); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); JSONObject json = @@ -1114,7 +1100,7 @@ private Response submitAndVerifyReservation(String path, String media, Response response = constructWebResource(path) .request(MediaType.APPLICATION_JSON) .accept(media) - .post(Entity.entity(toJson(rsci, ReservationSubmissionRequestInfo.class), + .post(Entity.entity(toJsonRoot(rsci, ReservationSubmissionRequestInfo.class), MediaType.APPLICATION_JSON_TYPE), Response.class); if (!this.isAuthenticationEnabled()) { @@ -1154,7 +1140,7 @@ private void updateReservationTestHelper(String path, Response response = constructWebResource(path) .request(MediaType.APPLICATION_JSON) .accept(media) - .post(Entity.entity(toJson(rsci, ReservationUpdateRequestInfo.class), + .post(Entity.entity(toJsonRoot(rsci, ReservationUpdateRequestInfo.class), MediaType.APPLICATION_JSON_TYPE), Response.class); if (!this.isAuthenticationEnabled()) { @@ -1212,9 +1198,8 @@ private void testDeleteReservationHelper(String path, Response response = constructWebResource(path) .request(MediaType.APPLICATION_JSON) .accept(media) - .post(Entity.entity(toJson(rsci, ReservationDeleteRequestInfo.class), + .post(Entity.entity(toJsonRoot(rsci, ReservationDeleteRequestInfo.class), MediaType.APPLICATION_JSON_TYPE), Response.class); - if (!this.isAuthenticationEnabled()) { assertResponseStatusCode(Response.Status.UNAUTHORIZED, response.getStatusInfo()); return; @@ -1244,7 +1229,7 @@ private JSONObject testListReservationHelper(WebTarget target) throws Exception private JSONObject testListReservationHelper(WebTarget target, Response.Status status) throws Exception { Thread.sleep(1000); - Response response = target.request().get(Response.class); + Response response = target.request(MediaType.APPLICATION_JSON_TYPE).get(Response.class); if (!this.isAuthenticationEnabled()) { assertResponseStatusCode(Response.Status.UNAUTHORIZED, response.getStatusInfo()); @@ -1264,13 +1249,8 @@ private void verifyReservationCount(int count) throws Exception { JSONObject json = testListReservationHelper(target); - if (count == 1) { - // If there are any number other than one reservation, this will throw. - json.getJSONObject("reservationListInfo").getJSONObject("reservations"); - } else { - JSONArray reservations = json.getJSONArray("reservations"); - assertTrue(reservations.length() == count); - } + JSONArray reservations = json.getJSONArray("reservations"); + assertEquals(reservations.length(), count); } private boolean isHttpSuccessResponse(Response response) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java index 6e574d79086bd..4dd7110da4fe6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java @@ -31,6 +31,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityDiagnosticConstant; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityState; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.NodeLabelsInfoReader; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; @@ -120,7 +121,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); config.register(NodeLabelsInfoReader.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java index a588b527b1179..ef3c1cbaf1c66 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java @@ -42,6 +42,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePath; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.placement.ResourceUsageMultiNodeLookupPolicy; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.util.resource.Resources; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; @@ -104,7 +105,8 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebappAuthentication.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebappAuthentication.java index 8a56ca3ec49f9..16427dce4f365 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebappAuthentication.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebappAuthentication.java @@ -18,7 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJsonNoRoot; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -200,7 +200,7 @@ private void testAnonymousKerberosUser() throws Exception { AppState appState = new AppState(); appState.setState("KILLED"); - requestBody = toJson(appState, AppState.class); + requestBody = toJsonNoRoot(appState, AppState.class); url = new URL("http://localhost:8088/ws/v1/cluster/apps/application_123_0/state"); conn = (HttpURLConnection) url.openConnection(); TestRMWebServicesDelegationTokenAuthentication.setupConn(conn, "PUT", diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java index 642443b15b2d9..d25fb5563a9f8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java @@ -53,6 +53,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.SerializationFeature; +import com.google.gson.Gson; import org.glassfish.jersey.jettison.JettisonJaxbContext; import org.glassfish.jersey.jettison.JettisonMarshaller; import org.w3c.dom.Document; @@ -195,13 +196,7 @@ public static void assertJsonResponse(Response response, String actual = OBJECT_WRITER.writeValueAsString(jsonNode); updateTestDataAutomatically(expectedResourceFilename, actual); - assertEquals( - // Deserialize/serialise again with the exact same settings - // to make sure jackson upgrade doesn't break the test - OBJECT_WRITER.writeValueAsString( - MAPPER.readTree( - Objects.requireNonNull(getResourceAsString(expectedResourceFilename)))), - actual); + assertEquals(getResourceAsString(expectedResourceFilename), actual); } /** @@ -351,7 +346,7 @@ public static void restoreSchedulerConfigFileInTarget() { public static String toEntity(Object obj, Class klass, String mediaType) throws Exception { if (mediaType == MediaType.APPLICATION_JSON) { - return toJson(obj, klass); + return toJsonNoRoot(obj, klass); } if(mediaType == MediaType.APPLICATION_XML) { return toXml(obj, klass); @@ -359,7 +354,7 @@ public static String toEntity(Object obj, Class klass, String mediaType) return null; } - public static String toJson(Object obj, Class klass) throws Exception { + public static String toJsonRoot(Object obj, Class klass) throws Exception { StringWriter stringWriter = new StringWriter(); JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(klass); JettisonMarshaller jettisonMarshaller = jettisonJaxbContext.createJsonMarshaller(); @@ -367,6 +362,10 @@ public static String toJson(Object obj, Class klass) throws Exception { return stringWriter.toString(); } + public static String toJsonNoRoot(Object obj, Class klass) throws Exception { + return new Gson().toJson(obj, klass); + } + public static String toXml(Object obj, Class klass) throws JAXBException { StringWriter stringWriter = new StringWriter(); JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(klass); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java index 7535ad260a739..9366275d2569e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java @@ -34,6 +34,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.JAXBContextResolver; import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebServices; import org.apache.hadoop.yarn.server.resourcemanager.webapp.TestRMWebServices; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.codehaus.jettison.json.JSONArray; @@ -65,7 +66,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -135,7 +137,7 @@ public void testClusterSchedulerWithSubQueues() JSONObject json = response.readEntity(JSONObject.class); JSONArray subQueueInfo = json.getJSONObject("scheduler") .getJSONObject("schedulerInfo").getJSONObject("rootQueue") - .getJSONObject("childQueues").getJSONObject("queue") + .getJSONObject("childQueues").getJSONArray("queue").getJSONObject(0) .getJSONObject("childQueues").getJSONArray("queue"); // subQueueInfo is consist of subqueue1 and subqueue2 info assertEquals(2, subQueueInfo.length()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairSchedulerCustomResourceTypes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairSchedulerCustomResourceTypes.java index 7fecd4b6aacd2..0d4f18ea925ba 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairSchedulerCustomResourceTypes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairSchedulerCustomResourceTypes.java @@ -36,6 +36,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.helper.BufferedClientResponse; import org.apache.hadoop.yarn.server.resourcemanager.webapp.helper.JsonCustomResourceTypeTestcase; import org.apache.hadoop.yarn.server.resourcemanager.webapp.helper.XmlCustomResourceTypeTestCase; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.util.resource.CustomResourceTypesConfigurationProvider; import org.apache.hadoop.yarn.util.resource.ResourceUtils; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -77,7 +78,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -217,11 +219,9 @@ private void verifyJsonResponse(WebTarget path, Response response, testCase.verify(json -> { try { - JSONObject queue = json.getJSONObject("scheduler") + JSONArray queues = json.getJSONObject("scheduler") .getJSONObject("schedulerInfo").getJSONObject("rootQueue") - .getJSONObject("childQueues").getJSONObject("queue"); - JSONArray queues = new JSONArray(); - queues.put(queue); + .getJSONObject("childQueues").getJSONArray("queue"); assertEquals(1, queues.length()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/helper/AppInfoJsonVerifications.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/helper/AppInfoJsonVerifications.java index 7bc8f6a0ab30c..fdaf90d345ec6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/helper/AppInfoJsonVerifications.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/helper/AppInfoJsonVerifications.java @@ -26,7 +26,9 @@ import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.checkStringEqual; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.checkStringMatch; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; /** @@ -88,8 +90,8 @@ public static void verify(JSONObject info, RMApp app) throws JSONException { "clusterUsagePerc doesn't match"); assertEquals(1, info.getInt("runningContainers"), "numContainers doesn't match"); - assertNotNull(info.get("preemptedResourceSecondsMap"), - "preemptedResourceSecondsMap should not be null"); + assertTrue(info.isNull("preemptedResourceSecondsMap"), + "preemptedResourceSecondsMap should be null, cause it is empty"); assertEquals(app.getRMAppMetrics().getResourcePreempted().getMemorySize(), info.getInt("preemptedResourceMB"), "preemptedResourceMB doesn't match"); assertEquals(app.getRMAppMetrics().getResourcePreempted().getVirtualCores(), diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-after-update.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-after-update.json index 8c2f22446d55d..7444be0c81b90 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-after-update.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-after-update.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -25,13 +25,13 @@ "queue" : [ { "queuePath" : "root.a", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "a", @@ -39,16 +39,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.a.b", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "b", @@ -59,7 +59,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -67,7 +66,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -78,38 +76,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 0 + "resourceValue" : "0.0" }, { "resourceName" : "vcores", - "resourceValue" : 0 + "resourceValue" : "0.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -117,7 +114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -132,7 +128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -140,7 +135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -155,7 +149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -163,7 +156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -178,7 +170,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -186,7 +177,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -196,17 +186,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -214,7 +203,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -229,7 +217,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -237,7 +224,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -252,7 +238,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -260,7 +245,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -275,7 +259,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -283,7 +266,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -298,7 +280,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -306,7 +287,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -321,7 +301,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -329,7 +308,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -339,14 +317,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -354,7 +331,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -369,7 +345,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -377,7 +352,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -392,7 +366,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -400,7 +373,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -425,29 +397,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -455,7 +426,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -470,7 +440,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -478,7 +447,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -493,7 +461,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -501,7 +468,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -518,16 +484,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.a.c", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "c", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 0 + "resourceValue" : "0.0" }, { "resourceName" : "vcores", - "resourceValue" : 0 + "resourceValue" : "0.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1003,7 +935,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1011,7 +942,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1022,38 +952,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4096.0,vcores=4.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 4096 + "resourceValue" : "4096.0" }, { "resourceName" : "vcores", - "resourceValue" : 4 + "resourceValue" : "4.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1061,7 +990,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1076,7 +1004,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1084,7 +1011,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1099,7 +1025,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1107,7 +1032,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1122,7 +1046,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1130,7 +1053,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1140,17 +1062,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1158,7 +1079,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1173,7 +1093,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1181,7 +1100,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1196,7 +1114,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1204,7 +1121,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1214,14 +1130,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1229,7 +1144,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1244,7 +1158,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1252,7 +1165,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1267,7 +1179,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1275,7 +1186,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1300,25 +1210,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 3.125, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 3.125, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -1329,7 +1239,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1337,7 +1246,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1348,38 +1256,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1024.0,vcores=1.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 1024 + "resourceValue" : "1024.0" }, { "resourceName" : "vcores", - "resourceValue" : 1 + "resourceValue" : "1.0" } ] }, "capacity" : 3.125, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 3.125, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1387,7 +1294,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1402,7 +1308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1410,7 +1315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1425,7 +1329,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1433,7 +1336,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1448,7 +1350,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1456,7 +1357,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1466,17 +1366,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1484,7 +1383,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1499,7 +1397,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1507,7 +1404,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1522,7 +1418,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1530,7 +1425,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1545,7 +1439,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1553,7 +1446,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1568,7 +1460,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1576,7 +1467,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1591,7 +1481,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1599,7 +1488,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1609,14 +1497,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1624,7 +1511,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1639,7 +1525,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1647,7 +1532,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1662,7 +1546,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1670,7 +1553,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1695,29 +1577,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 312, "maxApplicationsPerUser" : 312, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1725,7 +1606,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1740,7 +1620,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1748,7 +1627,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1763,7 +1641,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1771,7 +1648,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1790,7 +1666,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -1802,21 +1678,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 32768, "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1824,7 +1699,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1839,7 +1713,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1847,7 +1720,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1862,7 +1734,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1870,7 +1741,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1885,7 +1755,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1893,7 +1762,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1903,7 +1771,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -1936,7 +1804,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1944,7 +1811,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1962,7 +1828,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1970,7 +1835,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1988,7 +1852,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1996,7 +1859,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2013,7 +1875,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2021,7 +1882,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2049,9 +1909,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-before-update.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-before-update.json index 36f16241f67e6..2e9bf9d9feee5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-before-update.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-before-update.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -24,14 +24,14 @@ "queues" : { "queue" : [ { "queuePath" : "root.a", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "a", @@ -39,16 +39,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.a.b", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "b", @@ -59,7 +59,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -67,7 +66,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -78,38 +76,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 0 + "resourceValue" : "0.0" }, { "resourceName" : "vcores", - "resourceValue" : 0 + "resourceValue" : "0.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -117,7 +114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -132,7 +128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -140,7 +135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -155,7 +149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -163,7 +156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -178,7 +170,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -186,7 +177,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -196,17 +186,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -214,7 +203,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -229,7 +217,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -237,7 +224,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -252,7 +238,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -260,7 +245,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -275,7 +259,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -283,7 +266,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -298,7 +280,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -306,7 +287,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -321,7 +301,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -329,7 +308,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -339,14 +317,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -354,7 +331,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -369,7 +345,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -377,7 +352,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -392,7 +366,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -400,7 +373,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -425,29 +397,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -455,7 +426,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -470,7 +440,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -478,7 +447,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -493,7 +461,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -501,7 +468,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -518,16 +484,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.a.c", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "c", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 0 + "resourceValue" : "0.0" }, { "resourceName" : "vcores", - "resourceValue" : 0 + "resourceValue" : "0.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1003,7 +935,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1011,7 +942,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1022,38 +952,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 0 + "resourceValue" : "0.0" }, { "resourceName" : "vcores", - "resourceValue" : 0 + "resourceValue" : "0.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1061,7 +990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1076,7 +1004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1084,7 +1011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1099,7 +1025,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1107,7 +1032,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1122,7 +1046,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1130,7 +1053,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1140,17 +1062,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1158,7 +1079,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1173,7 +1093,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1181,7 +1100,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1196,7 +1114,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1204,7 +1121,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1214,14 +1130,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1229,7 +1144,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1244,7 +1158,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1252,7 +1165,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1267,7 +1179,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1275,7 +1186,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1300,25 +1210,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 3.125, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 3.125, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -1329,7 +1239,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1337,7 +1246,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1348,38 +1256,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1024.0,vcores=1.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 1024 + "resourceValue" : "1024.0" }, { "resourceName" : "vcores", - "resourceValue" : 1 + "resourceValue" : "1.0" } ] }, "capacity" : 3.125, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 3.125, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1387,7 +1294,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1402,7 +1308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1410,7 +1315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1425,7 +1329,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1433,7 +1336,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1448,7 +1350,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1456,7 +1357,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1466,17 +1366,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1484,7 +1383,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1499,7 +1397,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1507,7 +1404,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1522,7 +1418,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1530,7 +1425,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1545,7 +1439,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1553,7 +1446,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1568,7 +1460,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1576,7 +1467,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1591,7 +1481,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1599,7 +1488,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1609,14 +1497,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1624,7 +1511,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1639,7 +1525,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1647,7 +1532,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1662,7 +1546,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1670,7 +1553,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1695,29 +1577,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 312, "maxApplicationsPerUser" : 312, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1725,7 +1606,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1740,7 +1620,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1748,7 +1627,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1763,7 +1641,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1771,7 +1648,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1790,7 +1666,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -1802,21 +1678,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 32768, "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1824,7 +1699,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1839,7 +1713,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1847,7 +1720,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1862,7 +1734,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1870,7 +1741,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1885,7 +1755,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1893,7 +1762,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1903,7 +1771,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -1936,7 +1804,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1944,7 +1811,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1962,7 +1828,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1970,7 +1835,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1988,7 +1852,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1996,7 +1859,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2013,7 +1875,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2021,7 +1882,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2049,9 +1909,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-legacy-after-update.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-legacy-after-update.json index bcfd64ca9e16f..fbb205aad8888 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-legacy-after-update.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-legacy-after-update.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -25,13 +25,13 @@ "queue" : [ { "queuePath" : "root.a", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "a", @@ -39,16 +39,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.a.b", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "b", @@ -59,7 +59,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -67,7 +66,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -78,38 +76,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 0 + "resourceValue" : "0.0" }, { "resourceName" : "vcores", - "resourceValue" : 0 + "resourceValue" : "0.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -117,7 +114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -132,7 +128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -140,7 +135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -155,7 +149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -163,7 +156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -178,7 +170,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -186,7 +177,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -196,17 +186,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -214,7 +203,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -229,7 +217,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -237,7 +224,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -252,7 +238,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -260,7 +245,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -275,7 +259,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -283,7 +266,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -298,7 +280,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -306,7 +287,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -321,7 +301,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -329,7 +308,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -339,14 +317,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -354,7 +331,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -369,7 +345,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -377,7 +352,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -392,7 +366,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -400,7 +373,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -425,29 +397,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -455,7 +426,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -470,7 +440,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -478,7 +447,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -493,7 +461,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -501,7 +468,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -518,16 +484,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.a.c", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "c", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 0 + "resourceValue" : "0.0" }, { "resourceName" : "vcores", - "resourceValue" : 0 + "resourceValue" : "0.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1003,7 +935,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1011,7 +942,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1022,38 +952,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4096.0,vcores=4.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 4096 + "resourceValue" : "4096.0" }, { "resourceName" : "vcores", - "resourceValue" : 4 + "resourceValue" : "4.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1061,7 +990,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1076,7 +1004,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1084,7 +1011,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1099,7 +1025,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1107,7 +1032,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1122,7 +1046,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1130,7 +1053,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1140,17 +1062,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1158,7 +1079,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1173,7 +1093,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1181,7 +1100,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1196,7 +1114,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1204,7 +1121,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1214,14 +1130,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1229,7 +1144,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1244,7 +1158,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1252,7 +1165,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1267,7 +1179,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1275,7 +1186,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1300,25 +1210,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 3.125, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 3.125, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -1329,7 +1239,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1337,7 +1246,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1348,38 +1256,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1024.0,vcores=1.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 1024 + "resourceValue" : "1024.0" }, { "resourceName" : "vcores", - "resourceValue" : 1 + "resourceValue" : "1.0" } ] }, "capacity" : 3.125, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 3.125, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1387,7 +1294,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1402,7 +1308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1410,7 +1315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1425,7 +1329,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1433,7 +1336,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1448,7 +1350,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1456,7 +1357,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1466,17 +1366,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1484,7 +1383,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1499,7 +1397,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1507,7 +1404,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1522,7 +1418,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1530,7 +1425,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1545,7 +1439,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1553,7 +1446,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1568,7 +1460,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1576,7 +1467,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1591,7 +1481,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1599,7 +1488,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1609,14 +1497,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1624,7 +1511,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1639,7 +1525,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1647,7 +1532,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1662,7 +1546,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1670,7 +1553,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1695,29 +1577,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 312, "maxApplicationsPerUser" : 312, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1725,7 +1606,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1740,7 +1620,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1748,7 +1627,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1763,7 +1641,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1771,7 +1648,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1790,7 +1666,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -1802,21 +1678,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 32768, "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1824,7 +1699,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1839,7 +1713,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1847,7 +1720,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1862,7 +1734,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1870,7 +1741,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1885,7 +1755,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1893,7 +1762,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1903,7 +1771,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -1936,7 +1804,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1944,7 +1811,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1962,7 +1828,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1970,7 +1835,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1988,7 +1852,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1996,7 +1859,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2013,7 +1875,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2021,7 +1882,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2049,9 +1909,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-legacy-before-update.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-legacy-before-update.json index b58ba19e6c685..0e597b84b3e87 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-legacy-before-update.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/configmutation-absolute-hierarchy-legacy-before-update.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -24,14 +24,14 @@ "queues" : { "queue" : [ { "queuePath" : "root.a", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "a", @@ -39,16 +39,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.a.b", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "b", @@ -59,7 +59,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -67,7 +66,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -78,38 +76,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 0 + "resourceValue" : "0.0" }, { "resourceName" : "vcores", - "resourceValue" : 0 + "resourceValue" : "0.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -117,7 +114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -132,7 +128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -140,7 +135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -155,7 +149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -163,7 +156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -178,7 +170,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -186,7 +177,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -196,17 +186,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -214,7 +203,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -229,7 +217,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -237,7 +224,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -252,7 +238,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -260,7 +245,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -275,7 +259,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -283,7 +266,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -298,7 +280,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -306,7 +287,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -321,7 +301,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -329,7 +308,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -339,14 +317,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -354,7 +331,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -369,7 +345,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -377,7 +352,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -392,7 +366,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -400,7 +373,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -425,29 +397,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -455,7 +426,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -470,7 +440,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -478,7 +447,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -493,7 +461,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -501,7 +468,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -518,16 +484,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.a.c", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "c", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 0 + "resourceValue" : "0.0" }, { "resourceName" : "vcores", - "resourceValue" : 0 + "resourceValue" : "0.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1003,7 +935,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1011,7 +942,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1022,38 +952,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 0 + "resourceValue" : "0.0" }, { "resourceName" : "vcores", - "resourceValue" : 0 + "resourceValue" : "0.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1061,7 +990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1076,7 +1004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1084,7 +1011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1099,7 +1025,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1107,7 +1032,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1122,7 +1046,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1130,7 +1053,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1140,17 +1062,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1158,7 +1079,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1173,7 +1093,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1181,7 +1100,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1196,7 +1114,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1204,7 +1121,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1214,14 +1130,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1229,7 +1144,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1244,7 +1158,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1252,7 +1165,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1267,7 +1179,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1275,7 +1186,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1300,25 +1210,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 3.125, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 3.125, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -1329,7 +1239,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1337,7 +1246,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1348,38 +1256,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1024.0,vcores=1.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 1024 + "resourceValue" : "1024.0" }, { "resourceName" : "vcores", - "resourceValue" : 1 + "resourceValue" : "1.0" } ] }, "capacity" : 3.125, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 3.125, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1387,7 +1294,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1402,7 +1308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1410,7 +1315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1425,7 +1329,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1433,7 +1336,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1448,7 +1350,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1456,7 +1357,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1466,17 +1366,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1484,7 +1383,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1499,7 +1397,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1507,7 +1404,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1522,7 +1418,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1530,7 +1425,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1545,7 +1439,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1553,7 +1446,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1568,7 +1460,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1576,7 +1467,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1591,7 +1481,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1599,7 +1488,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1609,14 +1497,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1624,7 +1511,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1639,7 +1525,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1647,7 +1532,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1662,7 +1546,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1670,7 +1553,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1695,29 +1577,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 312, "maxApplicationsPerUser" : 312, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1725,7 +1606,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1740,7 +1620,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1748,7 +1627,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1763,7 +1641,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1771,7 +1648,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1790,7 +1666,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -1802,21 +1678,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 32768, "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1824,7 +1699,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1839,7 +1713,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1847,7 +1720,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1862,7 +1734,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1870,7 +1741,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1885,7 +1755,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1893,7 +1762,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1903,7 +1771,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -1936,7 +1804,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1944,7 +1811,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1962,7 +1828,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1970,7 +1835,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1988,7 +1852,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1996,7 +1859,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2013,7 +1875,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2021,7 +1882,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2049,9 +1909,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-0.json index fb3fe99950ce4..7ffe0318dfb77 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,38 +60,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4096.0,vcores=4.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 4096 + "resourceValue" : "4096.0" }, { "resourceName" : "vcores", - "resourceValue" : 4 + "resourceValue" : "4.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,38 +966,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,38 +1411,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,38 +2146,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-16.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-16.json index edbe4e62f602e..e3c441463a370 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-16.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-16.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,38 +60,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4096.0,vcores=4.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 4096 + "resourceValue" : "4096.0" }, { "resourceName" : "vcores", - "resourceValue" : 4 + "resourceValue" : "4.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,38 +966,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,38 +1411,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 6144, "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 8192, "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,38 +2146,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 6144, "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-32.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-32.json index b97bfdb2e38a0..e7e605ad68e68 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-32.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-32.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,38 +60,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4096.0,vcores=4.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 4096 + "resourceValue" : "4096.0" }, { "resourceName" : "vcores", - "resourceValue" : 4 + "resourceValue" : "4.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,38 +966,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,38 +1411,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,38 +2146,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-legacy-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-legacy-0.json index 8c3130d473b28..3cd78a1b7b0f7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-legacy-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testAbsoluteMode-legacy-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 0, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,38 +60,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4096.0,vcores=4.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 4096 + "resourceValue" : "4096.0" }, { "resourceName" : "vcores", - "resourceValue" : 4 + "resourceValue" : "4.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 0, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 0, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 0, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 0, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 0, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,38 +966,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 0, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 0, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,38 +1411,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 0, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 0, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 0, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,38 +2146,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 0, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-0.json index e481e20ca287a..b821aaa14ec39 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -79,35 +77,40 @@ "resourceValue" : "12.5%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -116,21 +119,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -139,7 +147,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +154,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +168,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +175,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +184,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +201,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +215,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +222,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +236,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +243,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +257,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +264,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +278,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +285,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +299,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +306,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +315,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +329,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +343,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +350,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +364,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +371,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +395,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +424,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +438,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +445,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +459,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +466,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +483,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +498,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +518,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +525,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +535,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -574,35 +552,40 @@ "resourceValue" : "12.5%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -611,21 +594,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -634,7 +622,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +629,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +643,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +650,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +659,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +676,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +690,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +697,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +711,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +718,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +732,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +739,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +753,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +760,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +774,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +781,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +790,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +804,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +818,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +825,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +839,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +846,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +870,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +899,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +913,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +920,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +934,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +941,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +957,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +977,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +984,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +994,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -1053,35 +1011,40 @@ "resourceValue" : "12.5%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1090,21 +1053,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1113,7 +1081,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1088,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1102,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1109,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1118,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1212,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1219,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1233,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1240,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1249,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1263,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1277,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1284,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1298,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1305,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1329,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1358,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1372,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1379,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1393,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1400,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1416,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1436,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1443,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1453,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -1532,35 +1470,40 @@ "resourceValue" : "75.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1569,21 +1512,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1592,7 +1540,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1547,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1561,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1568,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1577,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1594,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1608,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1615,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1629,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1636,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1650,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1657,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1671,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1678,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1692,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1699,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1708,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1722,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1736,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1743,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1757,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1764,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1788,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1817,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1831,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1838,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1852,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1859,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1881,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1888,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1898,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -1997,35 +1915,40 @@ "resourceValue" : "50.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2034,21 +1957,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2057,7 +1985,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1992,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +2006,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +2013,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +2022,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +2039,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +2053,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +2060,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2074,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2081,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2090,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2104,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2118,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2125,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2139,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2146,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2170,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2199,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2206,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2216,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=37.5%,vcores=37.5%]", @@ -2323,35 +2233,40 @@ "resourceValue" : "37.5%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2360,21 +2275,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2383,7 +2303,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2310,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2324,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2331,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2340,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2392,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2399,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2413,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2420,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2434,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2441,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2455,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2462,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2471,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2485,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2499,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2506,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2520,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2527,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2551,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2640,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,35 +2652,40 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2797,21 +2694,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2820,7 +2722,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2729,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2743,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2750,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2759,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2792,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2799,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2816,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2823,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2840,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2847,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2863,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2870,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2897,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-16.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-16.json index f0845cada043b..400181bcbe05b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-16.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-16.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -80,34 +78,39 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -116,21 +119,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -139,7 +147,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +154,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +168,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +175,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +184,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +201,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +215,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +222,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +236,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +243,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +257,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +264,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +278,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +285,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +299,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +306,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +315,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +329,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +343,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +350,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +364,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +371,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +395,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +424,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +438,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +445,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +459,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +466,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +483,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +498,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +518,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +525,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +535,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -575,34 +553,39 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -611,21 +594,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -634,7 +622,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +629,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +643,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +650,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +659,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +676,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +690,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +697,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +711,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +718,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +732,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +739,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +753,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +760,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +774,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +781,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +790,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +804,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +818,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +825,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +839,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +846,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +870,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +899,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +913,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +920,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +934,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +941,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +957,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +977,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +984,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +994,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -1054,34 +1012,39 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1090,21 +1053,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1113,7 +1081,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1088,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1102,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1109,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1118,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1212,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1219,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1233,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1240,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1249,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1263,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1277,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1284,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1298,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1305,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1329,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1358,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1372,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1379,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1393,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1400,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1416,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1436,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1443,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1453,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -1532,35 +1470,40 @@ "resourceValue" : "75.0%" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1569,21 +1512,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1592,7 +1540,6 @@ "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1547,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1561,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1568,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1577,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1594,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1608,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1615,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1629,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1636,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1650,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1657,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1671,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1678,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1692,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1699,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1708,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 6144, "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1722,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1736,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1743,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1757,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1764,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1788,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1817,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1831,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1838,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1852,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1859,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1881,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1888,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1898,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -1997,35 +1915,40 @@ "resourceValue" : "50.0%" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2034,21 +1957,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2057,7 +1985,6 @@ "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1992,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +2006,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +2013,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +2022,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +2039,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +2053,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +2060,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2074,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2081,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2090,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 8192, "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2104,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2118,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2125,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2139,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2146,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2170,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2199,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2206,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2216,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=37.5%,vcores=37.5%]", @@ -2324,34 +2234,39 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2360,21 +2275,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2383,7 +2303,6 @@ "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2310,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2324,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2331,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2340,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2392,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2399,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2413,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2420,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2434,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2441,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2455,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2462,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2471,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 6144, "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2485,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2499,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2506,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2520,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2527,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2551,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2580,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2622,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2640,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,35 +2652,40 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2797,21 +2694,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2820,7 +2722,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2729,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2743,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2750,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2759,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2792,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2799,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2816,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2823,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2840,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2847,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2863,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2870,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2897,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-legacy-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-legacy-0.json index 871e2b7287694..f581827546f06 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-legacy-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-legacy-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -80,34 +78,39 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -116,21 +119,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -139,7 +147,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +154,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +168,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +175,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +184,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +201,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +215,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +222,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +236,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +243,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +257,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +264,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +278,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +285,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +299,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +306,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +315,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +329,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +343,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +350,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +364,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +371,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +395,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +424,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +438,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +445,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +459,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +466,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +483,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +498,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +518,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +525,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +535,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -575,34 +553,39 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -611,21 +594,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -634,7 +622,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +629,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +643,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +650,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +659,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +676,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +690,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +697,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +711,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +718,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +732,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +739,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +753,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +760,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +774,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +781,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +790,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +804,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +818,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +825,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +839,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +846,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +870,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +899,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +913,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +920,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +934,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +941,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +957,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +977,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +984,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +994,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -1054,34 +1012,39 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1090,21 +1053,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1113,7 +1081,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1088,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1102,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1109,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1118,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1212,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1219,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1233,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1240,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1249,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1263,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1277,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1284,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1298,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1305,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1329,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1358,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1372,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1379,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1393,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1400,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1416,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1436,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1443,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1453,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -1532,35 +1470,40 @@ "resourceValue" : "75.0%" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1569,21 +1512,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -1592,7 +1540,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1547,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1561,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1568,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1577,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1594,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1608,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1615,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1629,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1636,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1650,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1657,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1671,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1678,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1692,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1699,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1708,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1722,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1736,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1743,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1757,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1764,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1788,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1817,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1831,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1838,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1852,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1859,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1881,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1888,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1898,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -1997,35 +1915,40 @@ "resourceValue" : "50.0%" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2034,21 +1957,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2057,7 +1985,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1992,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +2006,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +2013,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +2022,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +2039,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +2053,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +2060,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2074,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2081,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2090,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2104,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2118,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2125,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2139,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2146,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2170,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2199,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2206,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2216,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=37.5%,vcores=37.5%]", @@ -2324,34 +2234,39 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2360,21 +2275,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2383,7 +2303,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2310,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2324,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2331,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2340,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2392,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2399,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2413,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2420,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2434,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2441,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2455,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2462,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2471,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2485,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2499,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2506,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2520,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2527,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2551,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2640,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,35 +2652,40 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2797,21 +2694,26 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", - "maximumAllocation" : 8192, - "minimumAllocation" : 1024, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "attributes" : "", - "maximumAllocation" : 4, - "minimumAllocation" : 1, + "maximumAllocation" : 9223372036854775807, + "minimumAllocation" : 0, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 + }, { + "maximumAllocation" : 2147483647, + "minimumAllocation" : 0, + "name" : "yarn.io/gpu", + "resourceType" : "COUNTABLE", + "units" : "", + "value" : 0 } ] } }, @@ -2820,7 +2722,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2729,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2743,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2750,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2759,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2792,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2799,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2816,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2823,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2840,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2847,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2863,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2870,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2897,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-0.json index 5243af74bd252..12cd076033233 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 4, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 4.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4.0w,vcores=4.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "4.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 4, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 4.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 16, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 16.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -574,21 +538,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -1053,21 +983,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16.0w,vcores=16.0w]", @@ -1997,21 +1859,20 @@ "resourceValue" : "16.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 16, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 16.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -2323,21 +2163,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-16.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-16.json index b4247fc119fe6..3669ab08a262a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-16.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-16.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 4, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 4.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4.0w,vcores=4.0w]", @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 4, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 4.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 16, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 16.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -1054,20 +984,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 6144, "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16.0w,vcores=16.0w]", @@ -1997,21 +1859,20 @@ "resourceValue" : "16.0w" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 16, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 16.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 8192, "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -2324,20 +2164,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 6144, "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-32.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-32.json index f3234b3a071c1..824448edb4a78 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-32.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-32.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 4, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 4.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4.0w,vcores=4.0w]", @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 4, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 4.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 16, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 16.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -1054,20 +984,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16.0w,vcores=16.0w]", @@ -1997,21 +1859,20 @@ "resourceValue" : "16.0w" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 16, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 16.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -2324,20 +2164,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-after-aqc.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-after-aqc.json index 372bf4386c499..cbbe4fd267cf2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-after-aqc.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-after-aqc.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 4, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 4.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4.0w,vcores=4.0w]", @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 4, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 4.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 16, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 16.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -1054,20 +984,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16.0w,vcores=16.0w]", @@ -1997,21 +1859,20 @@ "resourceValue" : "16.0w" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 16, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 16.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,24 +2100,24 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { "queuePath" : "root.test2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2283,16 +2125,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.auto1", "capacity" : 41.666664, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 15.625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 10, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 10.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "auto1", @@ -2303,7 +2145,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2311,7 +2152,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2322,12 +2162,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=10.0w,vcores=10.0w]", @@ -2340,20 +2180,19 @@ } ] }, "capacity" : 41.666664, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 15.625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 10, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 10.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2361,7 +2200,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2376,7 +2214,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2384,7 +2221,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2399,7 +2235,6 @@ "vCores" : 5, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2407,7 +2242,6 @@ "units" : "Mi", "value" : 5120 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2422,7 +2256,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2430,7 +2263,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2440,17 +2272,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2458,7 +2289,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2473,7 +2303,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2481,7 +2310,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2496,7 +2324,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2504,7 +2331,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2519,7 +2345,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2527,7 +2352,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2542,7 +2366,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2550,7 +2373,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2565,7 +2387,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2573,7 +2394,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2583,14 +2403,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 5120, "vCores" : 5, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2598,7 +2417,6 @@ "units" : "Mi", "value" : 5120 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2613,7 +2431,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2621,7 +2438,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2636,7 +2452,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2644,7 +2459,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2669,29 +2483,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1562, "maxApplicationsPerUser" : 1562, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2699,7 +2512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2714,7 +2526,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2722,7 +2533,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2737,7 +2547,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2745,7 +2554,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2762,16 +2570,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.auto2", "capacity" : 41.666664, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 15.625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 10, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 10.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "auto2", @@ -2782,7 +2590,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2790,7 +2597,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2801,12 +2607,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=10.0w,vcores=10.0w]", @@ -2819,20 +2625,19 @@ } ] }, "capacity" : 41.666664, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 15.625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 10, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 10.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2840,7 +2645,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2855,7 +2659,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2863,7 +2666,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2878,7 +2680,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2886,7 +2687,6 @@ "units" : "Mi", "value" : 5120 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2901,7 +2701,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2909,7 +2708,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2919,17 +2717,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2937,7 +2734,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2952,7 +2748,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2960,7 +2755,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2975,7 +2769,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2983,7 +2776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2998,7 +2790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3006,7 +2797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3021,7 +2811,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3029,7 +2818,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3044,7 +2832,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3052,7 +2839,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3062,14 +2848,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 5120, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3077,7 +2862,6 @@ "units" : "Mi", "value" : 5120 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3092,7 +2876,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3100,7 +2883,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3115,7 +2897,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3123,7 +2904,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3148,29 +2928,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1562, "maxApplicationsPerUser" : 1562, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3178,7 +2957,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3193,7 +2971,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3201,7 +2978,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3216,7 +2992,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3224,7 +2999,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3243,13 +3017,13 @@ }, { "queuePath" : "root.test2.autoParent1", "capacity" : 4.166667, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "autoParent1", @@ -3257,16 +3031,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.autoParent1.auto4", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 0.78125, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "auto4", @@ -3277,7 +3051,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3285,7 +3058,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3296,12 +3068,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -3313,21 +3085,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 0.78125, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -3335,7 +3106,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -3350,7 +3120,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -3358,7 +3127,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -3373,7 +3141,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3381,7 +3148,6 @@ "units" : "Mi", "value" : 256 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3396,7 +3162,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3404,7 +3169,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3414,17 +3178,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3432,7 +3195,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3447,7 +3209,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3455,7 +3216,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3470,7 +3230,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3478,7 +3237,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3493,7 +3251,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3501,7 +3258,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3516,7 +3272,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3524,7 +3279,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3539,7 +3293,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3547,7 +3300,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3557,14 +3309,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 256, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3572,7 +3323,6 @@ "units" : "Mi", "value" : 256 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3587,7 +3337,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3595,7 +3344,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3610,7 +3358,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3618,7 +3365,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3643,29 +3389,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 300, "maxApplicationsPerUser" : 300, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3673,7 +3418,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3688,7 +3432,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3696,7 +3439,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3711,7 +3453,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3719,7 +3460,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3736,16 +3476,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.autoParent1.auto3", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 0.78125, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "auto3", @@ -3756,7 +3496,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3764,7 +3503,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3775,12 +3513,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -3792,21 +3530,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 0.78125, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -3814,7 +3551,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -3829,7 +3565,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -3837,7 +3572,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -3852,7 +3586,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3860,7 +3593,6 @@ "units" : "Mi", "value" : 256 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3875,7 +3607,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3883,7 +3614,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3893,17 +3623,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3911,7 +3640,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3926,7 +3654,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3934,7 +3661,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3949,7 +3675,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3957,7 +3682,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3972,7 +3696,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3980,7 +3703,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3995,7 +3717,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4003,7 +3724,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4018,7 +3738,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4026,7 +3745,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4036,14 +3754,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 256, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4051,7 +3768,6 @@ "units" : "Mi", "value" : 256 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4066,7 +3782,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4074,7 +3789,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4089,7 +3803,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4097,7 +3810,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4122,29 +3834,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 300, "maxApplicationsPerUser" : 300, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4152,7 +3863,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4167,7 +3877,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4175,7 +3884,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4190,7 +3898,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4198,7 +3905,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4221,7 +3927,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4229,7 +3934,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4240,12 +3944,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -4258,20 +3962,19 @@ } ] }, "capacity" : 4.166667, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -4279,7 +3982,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -4294,7 +3996,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -4302,7 +4003,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -4317,7 +4017,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4325,7 +4024,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4340,7 +4038,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4348,7 +4045,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4358,17 +4054,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4376,7 +4071,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4391,7 +4085,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4399,7 +4092,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4414,7 +4106,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4422,7 +4113,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4432,14 +4122,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4447,7 +4136,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4462,7 +4150,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4470,7 +4157,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4485,7 +4171,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4493,7 +4178,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4518,18 +4202,18 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "flexible", "autoQueueTemplateProperties" : { - "property" : { + "property" : [ { "name" : "maximum-applications", - "value" : 300 - } + "value" : "300" + } ] }, - "autoQueueParentTemplateProperties" : "", + "autoQueueParentTemplateProperties" : { }, "autoQueueLeafTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -4542,30 +4226,30 @@ }, { "queuePath" : "root.test2.autoParent2", "capacity" : 4.166667, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "autoParent2", "isAbsoluteResource" : false, "state" : "RUNNING", "queues" : { - "queue" : { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "queue" : [ { + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.autoParent2.auto5", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "auto5", @@ -4576,7 +4260,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4584,7 +4267,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4595,12 +4277,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -4612,21 +4294,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -4634,7 +4315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -4649,7 +4329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -4657,7 +4336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -4672,7 +4350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4680,7 +4357,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4695,7 +4371,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4703,7 +4378,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4713,17 +4387,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4731,7 +4404,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4746,7 +4418,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4754,7 +4425,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4769,7 +4439,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4777,7 +4446,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4792,7 +4460,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4800,7 +4467,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4815,7 +4481,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4823,7 +4488,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4838,7 +4502,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4846,7 +4509,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4856,14 +4518,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4871,7 +4532,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4886,7 +4546,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4894,7 +4553,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4909,7 +4567,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4917,7 +4574,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4942,29 +4598,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 156, "maxApplicationsPerUser" : 156, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4972,7 +4627,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4987,7 +4641,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4995,7 +4648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5010,7 +4662,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5018,7 +4669,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5034,14 +4684,13 @@ "isAutoCreatedLeafQueue" : false, "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 - } + } ] }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5049,7 +4698,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5060,12 +4708,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -5078,20 +4726,19 @@ } ] }, "capacity" : 4.166667, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5099,7 +4746,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5114,7 +4760,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5122,7 +4767,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5137,7 +4781,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5145,7 +4788,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5160,7 +4802,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5168,7 +4809,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5178,17 +4818,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5196,7 +4835,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5211,7 +4849,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5219,7 +4856,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5234,7 +4870,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5242,7 +4877,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5252,14 +4886,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5267,7 +4900,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5282,7 +4914,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5290,7 +4921,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5305,7 +4935,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5313,7 +4942,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5338,13 +4966,13 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, "autoQueueLeafTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -5357,30 +4985,30 @@ }, { "queuePath" : "root.test2.parent2", "capacity" : 4.166667, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "parent2", "isAbsoluteResource" : false, "state" : "RUNNING", "queues" : { - "queue" : { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "queue" : [ { + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.parent2.auto7", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "auto7", @@ -5391,7 +5019,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5399,7 +5026,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5410,12 +5036,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -5427,21 +5053,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5449,7 +5074,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5464,7 +5088,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5472,7 +5095,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5487,7 +5109,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5495,7 +5116,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5510,7 +5130,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5518,7 +5137,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5528,17 +5146,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5546,7 +5163,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5561,7 +5177,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5569,7 +5184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5584,7 +5198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5592,7 +5205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5607,7 +5219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5615,7 +5226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5630,7 +5240,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5638,7 +5247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5653,7 +5261,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5661,7 +5268,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5671,14 +5277,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5686,7 +5291,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5701,7 +5305,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5709,7 +5312,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5724,7 +5326,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5732,7 +5333,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5757,29 +5357,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 156, "maxApplicationsPerUser" : 156, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5787,7 +5386,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5802,7 +5400,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5810,7 +5407,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5825,7 +5421,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5833,7 +5428,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5849,14 +5443,13 @@ "isAutoCreatedLeafQueue" : false, "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 - } + } ] }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5864,7 +5457,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5875,12 +5467,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -5893,20 +5485,19 @@ } ] }, "capacity" : 4.166667, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5914,7 +5505,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5929,7 +5519,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5937,7 +5526,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5952,7 +5540,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5960,7 +5547,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5975,7 +5561,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5983,7 +5568,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5993,17 +5577,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6011,7 +5594,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6026,7 +5608,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6034,7 +5615,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6049,7 +5629,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6057,7 +5636,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6067,14 +5645,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6082,7 +5659,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6097,7 +5673,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6105,7 +5680,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6120,7 +5694,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6128,7 +5701,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6153,13 +5725,13 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, "autoQueueLeafTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -6172,46 +5744,46 @@ }, { "queuePath" : "root.test2.parent", "capacity" : 4.166667, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "parent", "isAbsoluteResource" : false, "state" : "RUNNING", "queues" : { - "queue" : { + "queue" : [ { "queuePath" : "root.test2.parent.autoParent2", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "autoParent2", "isAbsoluteResource" : false, "state" : "RUNNING", "queues" : { - "queue" : { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "queue" : [ { + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.parent.autoParent2.auto6", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "auto6", @@ -6222,7 +5794,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6230,7 +5801,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6241,12 +5811,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -6258,21 +5828,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -6280,7 +5849,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -6295,7 +5863,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -6303,7 +5870,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -6318,7 +5884,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6326,7 +5891,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6341,7 +5905,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6349,7 +5912,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6359,17 +5921,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6377,7 +5938,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6392,7 +5952,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6400,7 +5959,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6415,7 +5973,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6423,7 +5980,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6438,7 +5994,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6446,7 +6001,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6461,7 +6015,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6469,7 +6022,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6484,7 +6036,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6492,7 +6043,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6502,14 +6052,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6517,7 +6066,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6532,7 +6080,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6540,7 +6087,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6555,7 +6101,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6563,7 +6108,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6588,29 +6132,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 156, "maxApplicationsPerUser" : 156, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6618,7 +6161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6633,7 +6175,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6641,7 +6182,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6656,7 +6196,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6664,7 +6203,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6680,14 +6218,13 @@ "isAutoCreatedLeafQueue" : false, "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 - } + } ] }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6695,7 +6232,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6706,12 +6242,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -6723,21 +6259,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -6745,7 +6280,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -6760,7 +6294,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -6768,7 +6301,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -6783,7 +6315,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6791,7 +6322,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6806,7 +6336,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6814,7 +6343,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6824,17 +6352,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6842,7 +6369,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6857,7 +6383,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6865,7 +6390,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6880,7 +6404,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6888,7 +6411,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6898,14 +6420,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6913,7 +6434,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6928,7 +6448,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6936,7 +6455,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6951,7 +6469,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6959,7 +6476,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6984,13 +6500,13 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, "autoQueueLeafTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -7000,14 +6516,13 @@ "value" : "pLeafUser" } ] } - } + } ] }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7015,7 +6530,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7026,12 +6540,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -7044,20 +6558,19 @@ } ] }, "capacity" : 4.166667, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7065,7 +6578,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7080,7 +6592,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7088,7 +6599,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7103,7 +6613,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7111,7 +6620,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7126,7 +6634,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7134,7 +6641,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7144,17 +6650,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7162,7 +6667,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7177,7 +6681,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7185,7 +6688,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7200,7 +6702,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7208,7 +6709,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7218,14 +6718,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7233,7 +6732,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7248,7 +6746,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7256,7 +6753,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7271,7 +6767,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7279,7 +6774,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7304,13 +6798,13 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, "autoQueueLeafTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -7327,7 +6821,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7335,7 +6828,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7346,12 +6838,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -7364,20 +6856,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7385,7 +6876,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7400,7 +6890,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7408,7 +6897,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7423,7 +6911,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7431,7 +6918,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7446,7 +6932,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7454,7 +6939,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7464,17 +6948,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7482,7 +6965,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7497,7 +6979,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7505,7 +6986,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7520,7 +7000,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7528,7 +7007,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7538,14 +7016,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7553,7 +7030,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7568,7 +7044,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7576,7 +7051,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7591,7 +7065,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7599,7 +7072,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7624,12 +7096,12 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, "autoQueueParentTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -7640,15 +7112,15 @@ } ] }, "autoQueueLeafTemplateProperties" : { - "property" : { + "property" : [ { "name" : "capacity", "value" : "10w" - } + } ] } } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -7660,21 +7132,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7682,7 +7153,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7697,7 +7167,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7705,7 +7174,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7720,7 +7188,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7728,7 +7195,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7743,7 +7209,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7751,7 +7216,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7761,7 +7225,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -7794,7 +7258,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7802,7 +7265,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7820,7 +7282,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7828,7 +7289,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7846,7 +7306,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7854,7 +7313,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7871,7 +7329,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7879,7 +7336,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7907,9 +7363,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-before-aqc.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-before-aqc.json index 0e52ca542f800..2bee584371733 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-before-aqc.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-before-aqc.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 4, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 4.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4.0w,vcores=4.0w]", @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 4, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 4.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 16, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 16.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -1054,20 +984,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16.0w,vcores=16.0w]", @@ -1997,21 +1859,20 @@ "resourceValue" : "16.0w" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 16, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 16.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,36 +2100,35 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { "queuePath" : "root.test2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", "isAbsoluteResource" : false, "state" : "RUNNING", - "queues" : "", + "queues" : { }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -2324,20 +2164,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 12, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 12.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2498,14 +2324,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2513,7 +2338,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2528,7 +2352,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2536,7 +2359,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2551,7 +2373,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2559,7 +2380,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2584,12 +2404,12 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, "autoQueueParentTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -2600,15 +2420,15 @@ } ] }, "autoQueueLeafTemplateProperties" : { - "property" : { + "property" : [ { "name" : "capacity", "value" : "10w" - } + } ] } } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2620,21 +2440,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2642,7 +2461,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2657,7 +2475,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2665,7 +2482,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2680,7 +2496,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2688,7 +2503,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2703,7 +2517,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2711,7 +2524,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2533,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2754,7 +2566,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2762,7 +2573,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2780,7 +2590,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2788,7 +2597,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2806,7 +2614,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2814,7 +2621,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2831,7 +2637,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2839,7 +2644,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2867,9 +2671,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-0.json index dab6776aa1862..3efd7d2615732 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,15 +23,15 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 4, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 4.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4.0w,vcores=4.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "4.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 4, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 4.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,13 +469,13 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 16, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 16.0, "normalizedWeight" : 0.5, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -518,15 +484,15 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -574,21 +538,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,15 +929,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -1053,21 +983,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,15 +1374,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.75, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, "normalizedWeight" : 0.75, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16.0w,vcores=16.0w]", @@ -1997,21 +1859,20 @@ "resourceValue" : "16.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 16, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 16.0, "normalizedWeight" : 0.5, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,24 +2100,24 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.375, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -2323,21 +2163,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, "normalizedWeight" : 0.375, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-16.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-16.json index 6689b4434f814..d4cddc63e436f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-16.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-16.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,15 +23,15 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 4, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 4.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4.0w,vcores=4.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "4.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 4, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 4.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,13 +469,13 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 16, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 16.0, "normalizedWeight" : 0.5, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -518,15 +484,15 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -574,21 +538,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,15 +929,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -1053,21 +983,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,15 +1374,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.75, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, "normalizedWeight" : 0.75, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 6144, "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16.0w,vcores=16.0w]", @@ -1997,21 +1859,20 @@ "resourceValue" : "16.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 16, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 16.0, "normalizedWeight" : 0.5, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 8192, "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,24 +2100,24 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.375, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -2323,21 +2163,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, "normalizedWeight" : 0.375, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 6144, "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-32.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-32.json index a7b9416c3fab7..a793351cdb714 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-32.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-32.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,15 +23,15 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 4, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 4.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4.0w,vcores=4.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "4.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 4, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 4.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,13 +469,13 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 16, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 16.0, "normalizedWeight" : 0.5, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -518,15 +484,15 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -574,21 +538,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,15 +929,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -1053,21 +983,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,15 +1374,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.75, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, "normalizedWeight" : 0.75, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16.0w,vcores=16.0w]", @@ -1997,21 +1859,20 @@ "resourceValue" : "16.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 16, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 16.0, "normalizedWeight" : 0.5, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,24 +2100,24 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.375, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -2323,21 +2163,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, "normalizedWeight" : 0.375, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-after-aqc.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-after-aqc.json index 7c31c8650f153..e1a9407652d68 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-after-aqc.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-after-aqc.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,15 +23,15 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 4, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 4.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4.0w,vcores=4.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "4.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 4, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 4.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,13 +469,13 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 16, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 16.0, "normalizedWeight" : 0.5, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -518,15 +484,15 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -574,21 +538,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,15 +929,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -1053,21 +983,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,15 +1374,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.75, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, "normalizedWeight" : 0.75, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16.0w,vcores=16.0w]", @@ -1997,21 +1859,20 @@ "resourceValue" : "16.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 16, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 16.0, "normalizedWeight" : 0.5, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,23 +2100,23 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { "queuePath" : "root.test2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.375, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -2283,15 +2125,15 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.auto1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 15.625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 10, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 10.0, "normalizedWeight" : 0.41666666, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -2303,7 +2145,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2311,7 +2152,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2322,12 +2162,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=10.0w,vcores=10.0w]", @@ -2339,21 +2179,20 @@ "resourceValue" : "10.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 15.625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 10, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 10.0, "normalizedWeight" : 0.41666666, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2361,7 +2200,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2376,7 +2214,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2384,7 +2221,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2399,7 +2235,6 @@ "vCores" : 5, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2407,7 +2242,6 @@ "units" : "Mi", "value" : 5120 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2422,7 +2256,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2430,7 +2263,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2440,17 +2272,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2458,7 +2289,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2473,7 +2303,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2481,7 +2310,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2496,7 +2324,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2504,7 +2331,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2519,7 +2345,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2527,7 +2352,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2542,7 +2366,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2550,7 +2373,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2565,7 +2387,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2573,7 +2394,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2583,14 +2403,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 5120, "vCores" : 5, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2598,7 +2417,6 @@ "units" : "Mi", "value" : 5120 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2613,7 +2431,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2621,7 +2438,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2636,7 +2452,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2644,7 +2459,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2669,29 +2483,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1562, "maxApplicationsPerUser" : 1562, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2699,7 +2512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2714,7 +2526,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2722,7 +2533,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2737,7 +2547,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2745,7 +2554,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2762,15 +2570,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.auto2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 15.625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 10, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 10.0, "normalizedWeight" : 0.41666666, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -2782,7 +2590,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2790,7 +2597,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2801,12 +2607,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=10.0w,vcores=10.0w]", @@ -2818,21 +2624,20 @@ "resourceValue" : "10.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 15.625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 10, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 10.0, "normalizedWeight" : 0.41666666, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2840,7 +2645,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2855,7 +2659,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2863,7 +2666,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2878,7 +2680,6 @@ "vCores" : 5, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2886,7 +2687,6 @@ "units" : "Mi", "value" : 5120 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2901,7 +2701,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2909,7 +2708,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2919,17 +2717,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2937,7 +2734,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2952,7 +2748,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2960,7 +2755,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2975,7 +2769,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2983,7 +2776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2998,7 +2790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3006,7 +2797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3021,7 +2811,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3029,7 +2818,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3044,7 +2832,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3052,7 +2839,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3062,14 +2848,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 5120, "vCores" : 5, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3077,7 +2862,6 @@ "units" : "Mi", "value" : 5120 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3092,7 +2876,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3100,7 +2883,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3115,7 +2897,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3123,7 +2904,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3148,29 +2928,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1562, "maxApplicationsPerUser" : 1562, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3178,7 +2957,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3193,7 +2971,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3201,7 +2978,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3216,7 +2992,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3224,7 +2999,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3242,13 +3016,13 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test2.autoParent1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, "normalizedWeight" : 0.041666668, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -3257,15 +3031,15 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.autoParent1.auto4", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 0.78125, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, "normalizedWeight" : 0.5, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -3277,7 +3051,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3285,7 +3058,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3296,12 +3068,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -3313,21 +3085,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 0.78125, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 1, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 1.0, "normalizedWeight" : 0.5, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -3335,7 +3106,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -3350,7 +3120,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -3358,7 +3127,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -3373,7 +3141,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3381,7 +3148,6 @@ "units" : "Mi", "value" : 256 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3396,7 +3162,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3404,7 +3169,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3414,17 +3178,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3432,7 +3195,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3447,7 +3209,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3455,7 +3216,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3470,7 +3230,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3478,7 +3237,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3493,7 +3251,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3501,7 +3258,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3516,7 +3272,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3524,7 +3279,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3539,7 +3293,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3547,7 +3300,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3557,14 +3309,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 256, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3572,7 +3323,6 @@ "units" : "Mi", "value" : 256 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3587,7 +3337,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3595,7 +3344,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3610,7 +3358,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3618,7 +3365,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3643,29 +3389,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 300, "maxApplicationsPerUser" : 300, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3673,7 +3418,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3688,7 +3432,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3696,7 +3439,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3711,7 +3453,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3719,7 +3460,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3736,15 +3476,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.autoParent1.auto3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 0.78125, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, "normalizedWeight" : 0.5, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -3756,7 +3496,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3764,7 +3503,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3775,12 +3513,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -3792,21 +3530,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 0.78125, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 1, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 1.0, "normalizedWeight" : 0.5, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -3814,7 +3551,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -3829,7 +3565,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -3837,7 +3572,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -3852,7 +3586,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3860,7 +3593,6 @@ "units" : "Mi", "value" : 256 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3875,7 +3607,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3883,7 +3614,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3893,17 +3623,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3911,7 +3640,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3926,7 +3654,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3934,7 +3661,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3949,7 +3675,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3957,7 +3682,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3972,7 +3696,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -3980,7 +3703,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3995,7 +3717,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4003,7 +3724,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4018,7 +3738,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4026,7 +3745,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4036,14 +3754,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 256, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4051,7 +3768,6 @@ "units" : "Mi", "value" : 256 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4066,7 +3782,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4074,7 +3789,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4089,7 +3803,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4097,7 +3810,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4122,29 +3834,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 300, "maxApplicationsPerUser" : 300, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4152,7 +3863,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4167,7 +3877,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4175,7 +3884,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4190,7 +3898,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4198,7 +3905,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4221,7 +3927,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4229,7 +3934,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4240,12 +3944,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -4257,21 +3961,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 1, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 1.0, "normalizedWeight" : 0.041666668, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -4279,7 +3982,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -4294,7 +3996,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -4302,7 +4003,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -4317,7 +4017,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4325,7 +4024,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4340,7 +4038,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4348,7 +4045,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4358,17 +4054,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4376,7 +4071,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4391,7 +4085,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4399,7 +4092,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4414,7 +4106,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4422,7 +4113,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4432,14 +4122,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4447,7 +4136,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4462,7 +4150,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4470,7 +4157,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4485,7 +4171,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4493,7 +4178,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4518,18 +4202,18 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "flexible", "autoQueueTemplateProperties" : { - "property" : { + "property" : [ { "name" : "maximum-applications", - "value" : 300 - } + "value" : "300" + } ] }, - "autoQueueParentTemplateProperties" : "", + "autoQueueParentTemplateProperties" : { }, "autoQueueLeafTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -4541,13 +4225,13 @@ } }, { "queuePath" : "root.test2.autoParent2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, "normalizedWeight" : 0.041666668, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -4555,17 +4239,17 @@ "isAbsoluteResource" : false, "state" : "RUNNING", "queues" : { - "queue" : { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "queue" : [ { + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.autoParent2.auto5", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 1, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 1.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "auto5", @@ -4576,7 +4260,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4584,7 +4267,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4595,12 +4277,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -4612,21 +4294,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 1, - "normalizedWeight" : 1, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 1.0, + "normalizedWeight" : 1.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -4634,7 +4315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -4649,7 +4329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -4657,7 +4336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -4672,7 +4350,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4680,7 +4357,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4695,7 +4371,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4703,7 +4378,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4713,17 +4387,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4731,7 +4404,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4746,7 +4418,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4754,7 +4425,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4769,7 +4439,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4777,7 +4446,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4792,7 +4460,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4800,7 +4467,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4815,7 +4481,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4823,7 +4488,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4838,7 +4502,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4846,7 +4509,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4856,14 +4518,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4871,7 +4532,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4886,7 +4546,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4894,7 +4553,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4909,7 +4567,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4917,7 +4574,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4942,29 +4598,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 156, "maxApplicationsPerUser" : 156, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4972,7 +4627,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -4987,7 +4641,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -4995,7 +4648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5010,7 +4662,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5018,7 +4669,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5034,14 +4684,13 @@ "isAutoCreatedLeafQueue" : false, "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 - } + } ] }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5049,7 +4698,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5060,12 +4708,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -5077,21 +4725,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 1, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 1.0, "normalizedWeight" : 0.041666668, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5099,7 +4746,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5114,7 +4760,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5122,7 +4767,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5137,7 +4781,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5145,7 +4788,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5160,7 +4802,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5168,7 +4809,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5178,17 +4818,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5196,7 +4835,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5211,7 +4849,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5219,7 +4856,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5234,7 +4870,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5242,7 +4877,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5252,14 +4886,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5267,7 +4900,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5282,7 +4914,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5290,7 +4921,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5305,7 +4935,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5313,7 +4942,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5338,13 +4966,13 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, "autoQueueLeafTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -5356,13 +4984,13 @@ } }, { "queuePath" : "root.test2.parent2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, "normalizedWeight" : 0.041666668, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -5370,17 +4998,17 @@ "isAbsoluteResource" : false, "state" : "RUNNING", "queues" : { - "queue" : { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "queue" : [ { + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.parent2.auto7", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 1, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 1.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "auto7", @@ -5391,7 +5019,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5399,7 +5026,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5410,12 +5036,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -5427,21 +5053,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 1, - "normalizedWeight" : 1, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 1.0, + "normalizedWeight" : 1.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5449,7 +5074,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5464,7 +5088,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5472,7 +5095,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5487,7 +5109,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5495,7 +5116,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5510,7 +5130,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5518,7 +5137,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5528,17 +5146,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5546,7 +5163,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5561,7 +5177,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5569,7 +5184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5584,7 +5198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5592,7 +5205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5607,7 +5219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5615,7 +5226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5630,7 +5240,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5638,7 +5247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5653,7 +5261,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5661,7 +5268,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5671,14 +5277,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5686,7 +5291,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5701,7 +5305,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5709,7 +5312,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5724,7 +5326,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5732,7 +5333,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5757,29 +5357,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 156, "maxApplicationsPerUser" : 156, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5787,7 +5386,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5802,7 +5400,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5810,7 +5407,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5825,7 +5421,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5833,7 +5428,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5849,14 +5443,13 @@ "isAutoCreatedLeafQueue" : false, "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 - } + } ] }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5864,7 +5457,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5875,12 +5467,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -5892,21 +5484,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 1, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 1.0, "normalizedWeight" : 0.041666668, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5914,7 +5505,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5929,7 +5519,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -5937,7 +5526,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -5952,7 +5540,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5960,7 +5547,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5975,7 +5561,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -5983,7 +5568,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -5993,17 +5577,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6011,7 +5594,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6026,7 +5608,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6034,7 +5615,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6049,7 +5629,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6057,7 +5636,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6067,14 +5645,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6082,7 +5659,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6097,7 +5673,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6105,7 +5680,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6120,7 +5694,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6128,7 +5701,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6153,13 +5725,13 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, "autoQueueLeafTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -6171,13 +5743,13 @@ } }, { "queuePath" : "root.test2.parent", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, "normalizedWeight" : 0.041666668, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -6185,33 +5757,33 @@ "isAbsoluteResource" : false, "state" : "RUNNING", "queues" : { - "queue" : { + "queue" : [ { "queuePath" : "root.test2.parent.autoParent2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 1, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 1.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "autoParent2", "isAbsoluteResource" : false, "state" : "RUNNING", "queues" : { - "queue" : { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "queue" : [ { + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2.parent.autoParent2.auto6", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 1, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 1.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "auto6", @@ -6222,7 +5794,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6230,7 +5801,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6241,12 +5811,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -6258,21 +5828,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 100, - "weight" : 1, - "normalizedWeight" : 1, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 100.0, + "weight" : 1.0, + "normalizedWeight" : 1.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -6280,7 +5849,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -6295,7 +5863,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -6303,7 +5870,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -6318,7 +5884,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6326,7 +5891,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6341,7 +5905,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6349,7 +5912,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6359,17 +5921,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6377,7 +5938,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6392,7 +5952,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6400,7 +5959,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6415,7 +5973,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6423,7 +5980,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6438,7 +5994,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6446,7 +6001,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6461,7 +6015,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6469,7 +6022,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6484,7 +6036,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6492,7 +6043,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6502,14 +6052,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6517,7 +6066,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6532,7 +6080,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6540,7 +6087,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6555,7 +6101,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6563,7 +6108,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6588,29 +6132,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 156, "maxApplicationsPerUser" : 156, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : -1, - "configuredMaxAMResourceLimit" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : -1.0, + "configuredMaxAMResourceLimit" : 1.0, "AMResourceLimit" : { "memory" : 32768, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6618,7 +6161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6633,7 +6175,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6641,7 +6182,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6656,7 +6196,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6664,7 +6203,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6680,14 +6218,13 @@ "isAutoCreatedLeafQueue" : false, "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 - } + } ] }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6695,7 +6232,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6706,12 +6242,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -6723,21 +6259,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 1, - "normalizedWeight" : 1, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 1.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -6745,7 +6280,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -6760,7 +6294,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -6768,7 +6301,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -6783,7 +6315,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6791,7 +6322,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6806,7 +6336,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6814,7 +6343,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6824,17 +6352,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6842,7 +6369,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6857,7 +6383,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6865,7 +6390,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6880,7 +6404,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6888,7 +6411,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6898,14 +6420,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6913,7 +6434,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6928,7 +6448,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6936,7 +6455,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6951,7 +6469,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -6959,7 +6476,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -6984,13 +6500,13 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, "autoQueueLeafTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -7000,14 +6516,13 @@ "value" : "pLeafUser" } ] } - } + } ] }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7015,7 +6530,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7026,12 +6540,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -7043,21 +6557,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 1.5625, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 1, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 1.0, "normalizedWeight" : 0.041666668, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7065,7 +6578,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7080,7 +6592,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7088,7 +6599,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7103,7 +6613,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7111,7 +6620,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7126,7 +6634,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7134,7 +6641,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7144,17 +6650,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7162,7 +6667,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7177,7 +6681,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7185,7 +6688,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7200,7 +6702,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7208,7 +6709,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7218,14 +6718,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 512, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7233,7 +6732,6 @@ "units" : "Mi", "value" : 512 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7248,7 +6746,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7256,7 +6753,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7271,7 +6767,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7279,7 +6774,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7304,13 +6798,13 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "dynamicFlexible", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, "autoQueueLeafTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -7327,7 +6821,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7335,7 +6828,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7346,12 +6838,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -7363,21 +6855,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 12, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.375, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7385,7 +6876,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7400,7 +6890,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7408,7 +6897,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7423,7 +6911,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7431,7 +6918,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7446,7 +6932,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7454,7 +6939,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7464,17 +6948,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7482,7 +6965,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7497,7 +6979,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7505,7 +6986,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7520,7 +7000,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7528,7 +7007,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7538,14 +7016,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7553,7 +7030,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7568,7 +7044,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7576,7 +7051,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7591,7 +7065,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7599,7 +7072,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7624,12 +7096,12 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, "autoQueueParentTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -7640,15 +7112,15 @@ } ] }, "autoQueueLeafTemplateProperties" : { - "property" : { + "property" : [ { "name" : "capacity", "value" : "10w" - } + } ] } } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -7660,21 +7132,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7682,7 +7153,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7697,7 +7167,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -7705,7 +7174,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -7720,7 +7188,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7728,7 +7195,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7743,7 +7209,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7751,7 +7216,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7761,7 +7225,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -7794,7 +7258,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7802,7 +7265,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7820,7 +7282,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7828,7 +7289,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7846,7 +7306,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7854,7 +7313,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7871,7 +7329,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -7879,7 +7336,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -7907,9 +7363,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-before-aqc.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-before-aqc.json index 011c9c730120a..ef0a6d5d9e421 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-before-aqc.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testWeightMode-legacy-before-aqc.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,15 +23,15 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 4, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 4.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4.0w,vcores=4.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "4.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 4, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 4.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,13 +469,13 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 16, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 16.0, "normalizedWeight" : 0.5, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -518,15 +484,15 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -574,21 +538,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,15 +929,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 2, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2.0w,vcores=2.0w]", @@ -1053,21 +983,20 @@ "resourceValue" : "2.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 2, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 2.0, "normalizedWeight" : 0.125, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,15 +1374,15 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.75, "numApplications" : 0, "maxParallelApps" : 2147483647, @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 12, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 12.0, "normalizedWeight" : 0.75, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16.0w,vcores=16.0w]", @@ -1997,21 +1859,20 @@ "resourceValue" : "16.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 16, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 16.0, "normalizedWeight" : 0.5, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,36 +2100,35 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { "queuePath" : "root.test2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 12, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.375, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", "isAbsoluteResource" : false, "state" : "RUNNING", - "queues" : "", + "queues" : { }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.0w,vcores=12.0w]", @@ -2323,21 +2163,20 @@ "resourceValue" : "12.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : 12, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : 12.0, "normalizedWeight" : 0.375, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2498,14 +2324,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2513,7 +2338,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2528,7 +2352,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2536,7 +2359,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2551,7 +2373,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2559,7 +2380,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2584,12 +2404,12 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "flexible", - "autoQueueTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, "autoQueueParentTemplateProperties" : { "property" : [ { "name" : "acl_administer_queue", @@ -2600,15 +2420,15 @@ } ] }, "autoQueueLeafTemplateProperties" : { - "property" : { + "property" : [ { "name" : "capacity", "value" : "10w" - } + } ] } } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2620,21 +2440,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2642,7 +2461,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2657,7 +2475,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2665,7 +2482,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2680,7 +2496,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2688,7 +2503,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2703,7 +2517,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2711,7 +2524,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2533,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2754,7 +2566,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2762,7 +2573,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2780,7 +2590,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2788,7 +2597,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2806,7 +2614,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2814,7 +2621,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2831,7 +2637,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2839,7 +2644,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2867,9 +2671,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-0.json index c90f04d2fc7c2..54354b01a4411 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=25.0%,vcores=25.0%]", @@ -79,21 +77,20 @@ "resourceValue" : "25.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,38 +966,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -1532,21 +1428,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -2323,21 +2163,20 @@ "resourceValue" : "75.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-16.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-16.json index aa1c481ed90f0..c23f12b6106c2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-16.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-16.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=25.0%,vcores=25.0%]", @@ -79,21 +77,20 @@ "resourceValue" : "25.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,38 +966,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 75, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 75.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -1532,21 +1428,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 75, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 75.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 7500, "maxApplicationsPerUser" : 7500, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -2323,21 +2163,20 @@ "resourceValue" : "75.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-32.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-32.json index 9b43e390bc38c..9989542e32343 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-32.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentage-32.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=25.0%,vcores=25.0%]", @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,38 +966,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -1532,21 +1428,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -2324,20 +2164,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-0.json index 2296b1cdb51aa..838de2502b966 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -574,21 +538,20 @@ "resourceValue" : "50.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -1053,21 +983,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,38 +1411,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -2323,21 +2163,20 @@ "resourceValue" : "75.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-16.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-16.json index 8531661681640..5ee9cb537884d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-16.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-16.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -1054,20 +984,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 75, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 75.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,38 +1411,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 75, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 75.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 7500, "maxApplicationsPerUser" : 7500, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -2323,21 +2163,20 @@ "resourceValue" : "75.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-32.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-32.json index b28ee360f0419..4252e599cd0b6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-32.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeight-32.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -1054,20 +984,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,38 +1411,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=12.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -2324,20 +2164,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-0.json index 73f3205cb9aa8..19468b959c7e1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=4.0]", @@ -76,24 +74,23 @@ "resourceValue" : "1.0w" }, { "resourceName" : "vcores", - "resourceValue" : 4 + "resourceValue" : "4.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -574,21 +538,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=2.0]", @@ -1050,24 +980,23 @@ "resourceValue" : "50.0%" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,38 +1411,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=86.0%]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", "resourceValue" : "86.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=100.0%]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", "resourceValue" : "100.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=3.0w,vcores=12.0]", @@ -2320,24 +2160,23 @@ "resourceValue" : "3.0w" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-16.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-16.json index 79c9da11dc1ff..5de99c4c64a70 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-16.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-16.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=4.0]", @@ -76,24 +74,23 @@ "resourceValue" : "1.0w" }, { "resourceName" : "vcores", - "resourceValue" : 4 + "resourceValue" : "4.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=2.0]", @@ -1050,24 +980,23 @@ "resourceValue" : "50.0%" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 75, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 75.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,38 +1411,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=86.0%]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", "resourceValue" : "86.0%" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 75, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 75.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 7500, "maxApplicationsPerUser" : 7500, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=100.0%]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=3.0w,vcores=12.0]", @@ -2320,24 +2160,23 @@ "resourceValue" : "3.0w" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-32.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-32.json index b30da4d6bde84..d07ba847c10d3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-32.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndPercentageAndWeightMixed-32.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=4.0]", @@ -76,24 +74,23 @@ "resourceValue" : "1.0w" }, { "resourceName" : "vcores", - "resourceValue" : 4 + "resourceValue" : "4.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=2.0]", @@ -1050,24 +980,23 @@ "resourceValue" : "50.0%" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,38 +1411,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12288.0,vcores=86.0%]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 12288 + "resourceValue" : "12288.0" }, { "resourceName" : "vcores", "resourceValue" : "86.0%" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=100.0%]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", "resourceValue" : "100.0%" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=3.0w,vcores=12.0]", @@ -2320,24 +2160,23 @@ "resourceValue" : "3.0w" }, { "resourceName" : "vcores", - "resourceValue" : 12 + "resourceValue" : "12.0" } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "mixed", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-0.json index 39993a2cfd0b9..08c6c081d406a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,38 +966,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 3, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=3.0w,vcores=3.0w]", @@ -2323,21 +2163,20 @@ "resourceValue" : "3.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 3, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-16.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-16.json index 5adcec164ad05..7cb2f9082db41 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-16.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-16.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,38 +966,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 75, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 75.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 75, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 75.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 7500, "maxApplicationsPerUser" : 7500, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 3, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=3.0w,vcores=3.0w]", @@ -2323,21 +2163,20 @@ "resourceValue" : "3.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 3, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 0, "maxApplicationsPerUser" : 0, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-32.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-32.json index cec8bac3dc91e..e397a61ea4439 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-32.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerAbsoluteAndWeight-32.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,38 +966,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,38 +1842,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=16384.0,vcores=16.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 16384 + "resourceValue" : "16384.0" }, { "resourceName" : "vcores", - "resourceValue" : 16 + "resourceValue" : "16.0" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 3, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=3.0w,vcores=3.0w]", @@ -2324,20 +2164,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 3, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-0.json index ac936db74a912..1c50dfba44747 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-0.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -79,21 +77,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -574,21 +538,20 @@ "resourceValue" : "12.5%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -1053,21 +983,20 @@ "resourceValue" : "12.5%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -1997,21 +1859,20 @@ "resourceValue" : "50.0%" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 3, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=3.0w,vcores=3.0w]", @@ -2323,21 +2163,20 @@ "resourceValue" : "3.0w" } ] }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 3, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 10000, "maxApplicationsPerUser" : 10000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-16.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-16.json index 3fd13811a47af..77d308db81757 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-16.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-16.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -1054,20 +984,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 1024, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 6144, "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -1997,21 +1859,20 @@ "resourceValue" : "50.0%" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 8192, "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 3, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=3.0w,vcores=3.0w]", @@ -2324,20 +2164,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 3, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 6144, "vCores" : 6, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 6144 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-32.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-32.json index d8d3409f8a319..a9d6b559c8ff0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-32.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/mixed-testSchedulerPercentageAndWeight-32.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test_1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -1054,20 +984,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_1.test_1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=1.0w,vcores=1.0w]", @@ -1532,21 +1428,20 @@ "resourceValue" : "1.0w" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -1997,21 +1859,20 @@ "resourceValue" : "50.0%" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test_2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : 3, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test_2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=3.0w,vcores=3.0w]", @@ -2324,20 +2164,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : 3, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : 3.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "weight", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteModeLegacyAutoCreation.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteModeLegacyAutoCreation.json index 3095a9c406310..1f40c01356bc1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteModeLegacyAutoCreation.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-AbsoluteModeLegacyAutoCreation.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 87.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 87.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,38 +60,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=28672.0,vcores=28.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 28672 + "resourceValue" : "28672.0" }, { "resourceName" : "vcores", - "resourceValue" : 28 + "resourceValue" : "28.0" } ] }, "capacity" : 87.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 87.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 28672, "vCores" : 28, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 28672 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 28, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 28672 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 28672, "vCores" : 28, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 28672 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 8750, "maxApplicationsPerUser" : 8750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -504,30 +470,30 @@ }, { "queuePath" : "root.managed", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "managed", "isAbsoluteResource" : true, "state" : "RUNNING", "queues" : { - "queue" : { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "queue" : [ { + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.managed.queue1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "queue1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,38 +521,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=2048.0,vcores=2.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 2048 + "resourceValue" : "2048.0" }, { "resourceName" : "vcores", - "resourceValue" : 2 + "resourceValue" : "2.0" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "absolute", "queueType" : "leaf", "creationMethod" : "dynamicLegacy", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -996,14 +928,13 @@ "isAutoCreatedLeafQueue" : true, "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 - } + } ] }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1011,7 +942,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1022,38 +952,37 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=4096.0,vcores=4.0]", "capacityVectorEntries" : [ { "resourceName" : "memory-mb", - "resourceValue" : 4096 + "resourceValue" : "4096.0" }, { "resourceName" : "vcores", - "resourceValue" : 4 + "resourceValue" : "4.0" } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1061,7 +990,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1076,7 +1004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1084,7 +1011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1099,7 +1025,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1107,7 +1032,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1122,7 +1046,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1130,7 +1053,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1140,17 +1062,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1158,7 +1079,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1173,7 +1093,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1181,7 +1100,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1196,7 +1114,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1204,7 +1121,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1214,14 +1130,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1229,7 +1144,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1244,7 +1158,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1252,7 +1165,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1267,7 +1179,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1275,7 +1186,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1316,13 +1226,13 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "legacy", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -1334,21 +1244,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1356,7 +1265,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1371,7 +1279,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1379,7 +1286,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1394,7 +1300,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1402,7 +1307,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1417,7 +1321,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1425,7 +1328,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1435,7 +1337,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -1468,7 +1370,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1476,7 +1377,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1494,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1502,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1520,7 +1418,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1528,7 +1425,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1545,7 +1441,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1553,7 +1448,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1581,9 +1475,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.json index 3ec47c5792e72..a4935ca362805 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.a", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 50, + "usedCapacity" : 0.0, + "maxCapacity" : 50.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 50, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 1, "maxParallelApps" : 2147483647, "queueName" : "a", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,7 +60,7 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "root-a-default-label", + "nodeLabels" : [ "root-a-default-label" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 1, @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 50, + "usedCapacity" : 0.0, + "maxCapacity" : 50.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 50, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 50.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -185,21 +175,20 @@ "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[]" }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 0, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -207,7 +196,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -222,7 +210,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -230,7 +217,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -245,7 +231,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -253,7 +238,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -268,7 +252,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -276,7 +259,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -296,7 +278,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -304,7 +285,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -319,7 +299,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -327,7 +306,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -342,7 +320,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -350,7 +327,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -365,7 +341,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -373,7 +348,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -388,7 +362,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -396,7 +369,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -411,7 +383,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -419,7 +390,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -436,7 +406,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -444,7 +413,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -459,7 +427,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -467,7 +434,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -482,7 +448,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -490,7 +455,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -505,7 +469,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -513,7 +476,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -528,7 +490,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -536,7 +497,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -551,7 +511,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -559,7 +518,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -576,7 +534,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -584,7 +541,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -599,7 +555,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -607,7 +562,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -622,7 +576,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -630,7 +583,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -655,29 +607,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 1, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, + "userLimit" : 100.0, "users" : { - "user" : { + "user" : [ { "username" : "user1", "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -685,7 +636,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -702,7 +652,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -710,7 +659,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -725,7 +673,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -733,7 +680,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -744,14 +690,13 @@ } }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -759,7 +704,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -774,7 +718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -782,7 +725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -797,7 +739,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -805,7 +746,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -820,7 +760,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -828,7 +767,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -843,7 +781,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -851,7 +788,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -866,7 +802,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -874,7 +809,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -884,20 +818,19 @@ } ] } } - } + } ] }, - "userWeight" : 1, + "userWeight" : 1.0, "isActive" : true - } + } ] }, - "userLimitFactor" : 1, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -905,7 +838,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -920,7 +852,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -928,7 +859,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -943,7 +873,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -951,7 +880,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -968,16 +896,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.b", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 1, "maxParallelApps" : 2147483647, "queueName" : "b", @@ -988,7 +916,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -996,7 +923,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1007,12 +933,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 1, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -1024,21 +950,20 @@ "resourceValue" : "50.0%" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1046,7 +971,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1061,7 +985,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1069,7 +992,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1084,7 +1006,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1092,7 +1013,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1107,7 +1027,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1115,7 +1034,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1125,17 +1043,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1143,7 +1060,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1158,7 +1074,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1166,7 +1081,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1181,7 +1095,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1189,7 +1102,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1204,7 +1116,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1212,7 +1123,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1227,7 +1137,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1235,7 +1144,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1250,7 +1158,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1258,7 +1165,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1268,14 +1174,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1283,7 +1188,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1298,7 +1202,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1306,7 +1209,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1321,7 +1223,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1329,7 +1230,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1354,29 +1254,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 1, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 5000, "maxApplicationsPerUser" : 5000, - "userLimit" : 100, + "userLimit" : 100.0, "users" : { - "user" : { + "user" : [ { "username" : "user2", "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1384,7 +1283,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1401,7 +1299,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1409,7 +1306,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1424,7 +1320,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1432,7 +1327,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1443,14 +1337,13 @@ } }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1458,7 +1351,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1473,7 +1365,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1481,7 +1372,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1496,7 +1386,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1393,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1519,7 +1407,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1527,7 +1414,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1542,7 +1428,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1550,7 +1435,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1565,7 +1449,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1573,7 +1456,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1583,20 +1465,19 @@ } ] } } - } + } ] }, - "userWeight" : 1, + "userWeight" : 1.0, "isActive" : true - } + } ] }, - "userLimitFactor" : 1, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1604,7 +1485,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1619,7 +1499,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1627,7 +1506,6 @@ "units" : "Mi", "value" : 1024 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1642,7 +1520,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1650,7 +1527,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1667,16 +1543,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.c", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "c", @@ -1687,7 +1563,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1695,7 +1570,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1706,12 +1580,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=37.5%,vcores=37.5%]", @@ -1724,20 +1598,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1745,7 +1618,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1760,7 +1632,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1768,7 +1639,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1783,7 +1653,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1660,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1674,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1681,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1824,17 +1690,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1842,7 +1707,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1857,7 +1721,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1865,7 +1728,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1880,7 +1742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1888,7 +1749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1903,7 +1763,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1911,7 +1770,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1926,7 +1784,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1934,7 +1791,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1949,7 +1805,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1957,7 +1812,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1967,14 +1821,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1982,7 +1835,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1997,7 +1849,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2005,7 +1856,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2020,7 +1870,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2028,7 +1877,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2053,29 +1901,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2083,7 +1930,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,7 +1944,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2106,7 +1951,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2121,7 +1965,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2129,7 +1972,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2148,7 +1990,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2160,21 +2002,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2182,7 +2023,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2197,7 +2037,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2205,7 +2044,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2220,7 +2058,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2228,7 +2065,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2243,7 +2079,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2251,7 +2086,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2261,7 +2095,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2294,7 +2128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2302,7 +2135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2320,7 +2152,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2328,7 +2159,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2346,7 +2176,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2354,7 +2183,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2371,7 +2199,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2379,7 +2206,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2407,9 +2233,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json index 2c09324605e7e..de49631b86c7a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PercentageModeLegacyAutoCreation.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", - "capacity" : 25, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 25.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 25.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=25.0%,vcores=25.0%]", @@ -79,21 +77,20 @@ "resourceValue" : "25.0%" } ] }, - "capacity" : 25, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 25.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 25.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 8192, "vCores" : 8, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 2500, "maxApplicationsPerUser" : 2500, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,26 +469,25 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.managed", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 75, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 75.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "managed", "isAbsoluteResource" : false, "state" : "RUNNING", - "queues" : "", + "queues" : { }, "resourcesUsed" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -530,7 +495,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -541,12 +505,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -558,21 +522,20 @@ "resourceValue" : "75.0%" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 75, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 75.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -580,7 +543,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -595,7 +557,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -603,7 +564,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -618,7 +578,6 @@ "vCores" : 24, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -626,7 +585,6 @@ "units" : "Mi", "value" : 24576 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -641,7 +599,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -649,7 +606,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -659,17 +615,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -677,7 +632,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -692,7 +646,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -700,7 +653,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -715,7 +667,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -723,7 +674,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -733,14 +683,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 24576, "vCores" : 24, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -748,7 +697,6 @@ "units" : "Mi", "value" : 24576 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -763,7 +711,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -771,7 +718,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -786,7 +732,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -794,7 +739,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -819,18 +763,18 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : true, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "legacy", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -842,21 +786,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -864,7 +807,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -879,7 +821,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -887,7 +828,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -902,7 +842,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -910,7 +849,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -925,7 +863,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -933,7 +870,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -943,7 +879,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -976,7 +912,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -984,7 +919,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1002,7 +936,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1010,7 +943,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1028,7 +960,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1036,7 +967,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1053,7 +983,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1061,7 +990,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1089,9 +1017,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.json index 456902e7353ba..c6857b0482e45 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.a", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 50, + "usedCapacity" : 0.0, + "maxCapacity" : 50.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 50, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "a", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,7 +60,7 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "root-a-default-label", + "nodeLabels" : [ "root-a-default-label" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 50, + "usedCapacity" : 0.0, + "maxCapacity" : 50.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 50, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 50.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -185,21 +175,20 @@ "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[]" }, - "capacity" : 0, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 0, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 0, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 0.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 0.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 0.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -207,7 +196,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -222,7 +210,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -230,7 +217,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -245,7 +231,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -253,7 +238,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -268,7 +252,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -276,7 +259,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -296,7 +278,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -304,7 +285,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -319,7 +299,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -327,7 +306,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -342,7 +320,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -350,7 +327,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -365,7 +341,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -373,7 +348,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -388,7 +362,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -396,7 +369,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -411,7 +383,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -419,7 +390,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -436,7 +406,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -444,7 +413,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -459,7 +427,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -467,7 +434,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -482,7 +448,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -490,7 +455,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -505,7 +469,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -513,7 +476,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -528,7 +490,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -536,7 +497,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -551,7 +511,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -559,7 +518,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -576,7 +534,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -584,7 +541,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -599,7 +555,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -607,7 +562,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -622,7 +576,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -630,7 +583,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -655,29 +607,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 2048, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -685,7 +636,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -700,7 +650,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -708,7 +657,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -723,7 +671,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -731,7 +678,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -748,16 +694,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.b", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "b", @@ -768,7 +714,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -776,7 +721,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -787,12 +731,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -804,21 +748,20 @@ "resourceValue" : "50.0%" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -826,7 +769,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -841,7 +783,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -849,7 +790,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -864,7 +804,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -872,7 +811,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -887,7 +825,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -895,7 +832,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -905,17 +841,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -923,7 +858,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -938,7 +872,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -946,7 +879,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -961,7 +893,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -969,7 +900,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -984,7 +914,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -992,7 +921,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1007,7 +935,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1015,7 +942,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1030,7 +956,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1038,7 +963,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1048,14 +972,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1063,7 +986,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1078,7 +1000,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1086,7 +1007,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1101,7 +1021,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1109,7 +1028,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1134,29 +1052,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 5000, "maxApplicationsPerUser" : 5000, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1164,7 +1081,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1179,7 +1095,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1187,7 +1102,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1202,7 +1116,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1210,7 +1123,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1227,16 +1139,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.c", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "c", @@ -1247,7 +1159,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1255,7 +1166,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1266,12 +1176,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=37.5%,vcores=37.5%]", @@ -1284,20 +1194,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1305,7 +1214,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1320,7 +1228,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1328,7 +1235,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1343,7 +1249,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1351,7 +1256,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1366,7 +1270,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1374,7 +1277,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1384,17 +1286,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1402,7 +1303,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1417,7 +1317,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1425,7 +1324,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1440,7 +1338,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1448,7 +1345,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1463,7 +1359,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1471,7 +1366,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1486,7 +1380,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1494,7 +1387,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1509,7 +1401,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1517,7 +1408,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1527,14 +1417,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1542,7 +1431,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1557,7 +1445,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1565,7 +1452,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1580,7 +1466,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1588,7 +1473,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1613,29 +1497,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1643,7 +1526,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1658,7 +1540,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1666,7 +1547,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1681,7 +1561,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1689,7 +1568,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1708,7 +1586,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -1720,21 +1598,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1742,7 +1619,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1757,7 +1633,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1765,7 +1640,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1780,7 +1654,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1788,7 +1661,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1803,7 +1675,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1811,7 +1682,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1821,7 +1691,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -1854,7 +1724,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1862,7 +1731,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1880,7 +1748,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1888,7 +1755,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1906,7 +1772,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1914,7 +1779,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1931,7 +1795,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1939,7 +1802,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1967,9 +1829,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file From 9fb4582ca07a9bf725f63cf0c8912a68eb0175c6 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Wed, 15 Oct 2025 16:47:07 +0200 Subject: [PATCH 02/19] Temporally move from yetus to ayushtkn --- dev-support/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 672061ea09ad9..8cc03dff69d5f 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -55,7 +55,7 @@ pipeline { environment { YETUS='yetus' // Branch or tag name. Yetus release tags are 'rel/X.Y.Z' - YETUS_VERSION='rel/0.14.0' + YETUS_VERSION='a7d29a6a72750a0c5c39512f33945e773e69303e' } parameters { @@ -71,7 +71,7 @@ pipeline { checkout([ $class: 'GitSCM', branches: [[name: "${env.YETUS_VERSION}"]], - userRemoteConfigs: [[ url: 'https://github.com/apache/yetus.git']]] + userRemoteConfigs: [[ url: 'https://github.com/ayushtkn/yetus.git']]] ) } } From 932565e037d77c3b6bff7710fc83cfae85ab3627 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Thu, 16 Oct 2025 09:49:01 +0200 Subject: [PATCH 03/19] Fix some test --- .../webapp/JAXBContextResolver.java | 2 - .../webapp/TestRMWebServicesApps.java | 2 + .../TestRMWebServicesAppsModification.java | 7 - ...estRMWebServicesConfigurationMutation.java | 13 +- ...ServicesDelegationTokenAuthentication.java | 12 +- .../TestRMWebServicesDelegationTokens.java | 10 +- .../webapp/TestRMWebServicesReservation.java | 8 +- .../webapp/TestRMWebappAuthentication.java | 4 +- .../webapp/TestWebServiceUtil.java | 31 +- .../webapp/reader/AppStateReader.java | 71 --- .../webapp/dynamic-testPercentageMode-0.json | 210 ++----- .../webapp/dynamic-testPercentageMode-16.json | 210 ++----- .../webapp/dynamic-testPercentageMode-32.json | 564 ++++++------------ .../dynamic-testPercentageMode-legacy-0.json | 210 ++----- 14 files changed, 386 insertions(+), 968 deletions(-) delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/AppStateReader.java diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java index b4ad232908e82..4fb58449a4a53 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java @@ -43,9 +43,7 @@ @Singleton @Provider public class JAXBContextResolver implements ContextResolver { - private static final Logger LOG = LoggerFactory.getLogger(JAXBContextResolver.class.getName()); - private final Map typesContextMap = new HashMap<>(); public JAXBContextResolver() throws Exception { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 1d87662332f91..62b4116a52d09 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -25,6 +25,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.http.JettyUtils; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.test.tags.FlakyTest; import org.apache.hadoop.util.Sets; import org.apache.hadoop.util.XMLUtils; import org.apache.hadoop.yarn.api.records.ContainerState; @@ -69,6 +70,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import java.io.StringReader; import java.util.ArrayList; +import java.util.Arrays; import java.util.Set; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index d5422d3b92615..81783da272df9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.mock; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.File; import java.io.IOException; @@ -56,7 +55,6 @@ import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -106,11 +104,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CredentialsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LocalResourceInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LogAggregationContextInfo; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.AppStateReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.util.Times; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; @@ -135,7 +129,6 @@ import org.glassfish.jersey.jettison.JettisonMarshaller; import org.glassfish.jersey.jettison.internal.entity.JettisonObjectProvider.App; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import static javax.ws.rs.core.Response.Status.ACCEPTED; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java index bd11e1accdc2f..8ffd187d7a494 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java @@ -36,7 +36,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.NodeLabelsInfoReader; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.dao.QueueConfigInfo; @@ -74,7 +73,7 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.getCapacitySchedulerConfigFileInTarget; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.backupSchedulerConfigFileInTarget; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.restoreSchedulerConfigFileInTarget; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJsonNoRoot; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -109,7 +108,6 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(NodeLabelsInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); config.register(JsonProviderFeature.class); config.register(JAXBContextResolver.class); @@ -804,7 +802,6 @@ public void testGlobalConfChange() throws Exception { newCSConf.getMaximumSystemApplications()); } - //TODO: fix, some missing label @Test public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { WebTarget r = target(); @@ -824,7 +821,7 @@ public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { response = addNodeLabelsResource.queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) .post(Entity.entity(logAndReturnJson(addNodeLabelsResource, - toJsonNoRoot(nodeLabelsInfo, NodeLabelsInfo.class)), MediaType.APPLICATION_JSON), Response.class); + toJson(nodeLabelsInfo, NodeLabelsInfo.class)), MediaType.APPLICATION_JSON), Response.class); // 2. Verify new Node Label response = getNodeLabelsResource.queryParam("user.name", userName) @@ -854,7 +851,7 @@ public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { response = schedulerConfResource .queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) - .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJsonNoRoot(updateInfo, + .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJson(updateInfo, SchedConfUpdateInfo.class)), MediaType.APPLICATION_JSON), Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); @@ -901,7 +898,7 @@ public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { response = schedulerConfResource .queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) - .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJsonNoRoot(updateInfo, + .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJson(updateInfo, SchedConfUpdateInfo.class)), MediaType.APPLICATION_JSON), Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); @@ -953,7 +950,7 @@ public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { response = schedulerConfResource .queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) - .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJsonNoRoot(updateInfo, + .put(Entity.entity(logAndReturnJson(schedulerConfResource, toJson(updateInfo, SchedConfUpdateInfo.class)), MediaType.APPLICATION_JSON), Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); assertEquals(Sets.newHashSet("*"), diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokenAuthentication.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokenAuthentication.java index 37c273aadb666..aa6a1c1ffd588 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokenAuthentication.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokenAuthentication.java @@ -18,7 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJsonNoRoot; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -311,11 +311,11 @@ public void testDelegationTokenOps(String header) throws Exception { DelegationToken createRequestToken = new DelegationToken(); createRequestToken.setRenewer("test"); String createRequest = - toJsonNoRoot(createRequestToken, DelegationToken.class); + toJson(createRequestToken, DelegationToken.class); DelegationToken renewRequestToken = new DelegationToken(); renewRequestToken.setToken(token); String renewRequest = - toJsonNoRoot(renewRequestToken, DelegationToken.class); + toJson(renewRequestToken, DelegationToken.class); // first test create and renew String[] requests = { createRequest, renewRequest }; @@ -363,7 +363,7 @@ public Void call() throws Exception { String renewer = "renewer"; DelegationToken token2 = new DelegationToken(); token2.setRenewer(renewer); - String body = toJsonNoRoot(token2, DelegationToken.class); + String body = toJson(token2, DelegationToken.class); URL url = new URL("http://localhost:8088/ws/v1/cluster/delegation-token?doAs=client2"); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); @@ -399,7 +399,7 @@ public Void call() throws Exception { String renewer = "renewer"; DelegationToken token2 = new DelegationToken(); token2.setRenewer(renewer); - String body = toJsonNoRoot(token2, DelegationToken.class); + String body = toJson(token2, DelegationToken.class); URL url = new URL("http://localhost:8088/ws/v1/cluster/delegation-token?doAs=client2"); @@ -445,7 +445,7 @@ public String call() throws Exception { String ret = null; DelegationToken token = new DelegationToken(); token.setRenewer(renewer); - String body = toJsonNoRoot(token, DelegationToken.class); + String body = toJson(token, DelegationToken.class); URL url = new URL("http://localhost:8088/ws/v1/cluster/delegation-token"); HttpURLConnection conn = (HttpURLConnection) url.openConnection(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java index 3134fadc259ec..51aac290b465d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java @@ -86,7 +86,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJsonNoRoot; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toEntity; import org.glassfish.jersey.internal.inject.AbstractBinder; import org.glassfish.jersey.logging.LoggingFeature; @@ -279,7 +279,7 @@ public void testCreateDelegationToken(int run) throws Exception { final String renewer = "test-renewer"; DelegationToken token = new DelegationToken(); token.setRenewer(renewer); - String jsonBody = toJsonNoRoot(token, DelegationToken.class); + String jsonBody = toJson(token, DelegationToken.class); String xmlBody = "" + renewer + ""; @@ -478,7 +478,7 @@ public Void call() throws Exception { if (mediaType.equals(MediaType.APPLICATION_JSON)) { DelegationToken dToken = new DelegationToken(); dToken.setToken(token); - body = toJsonNoRoot(dToken, DelegationToken.class); + body = toJson(dToken, DelegationToken.class); } else { body = "" + token @@ -511,7 +511,7 @@ private void verifySimpleAuthRenew(String mediaType, String contentType) throws DelegationToken delegationToken = new DelegationToken(); body = "{\"token\": \"" + token + "\" }"; delegationToken.setToken("test-123"); - body = toJsonNoRoot(delegationToken, DelegationToken.class); + body = toJson(delegationToken, DelegationToken.class); } else { body = "" + token + ""; @@ -823,7 +823,7 @@ private static String generateRenewTokenBody(String mediaType, String token) if (mediaType.contains(MediaType.APPLICATION_JSON)) { DelegationToken dToken = new DelegationToken(); dToken.setToken(token); - body = toJsonNoRoot(dToken, DelegationToken.class); + body = toJson(dToken, DelegationToken.class); } else { body = "" + token + ""; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index 263d60a88096e..9339ad490796f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -18,7 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJsonRoot; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.assertj.core.api.Assertions.assertThat; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -1100,7 +1100,7 @@ private Response submitAndVerifyReservation(String path, String media, Response response = constructWebResource(path) .request(MediaType.APPLICATION_JSON) .accept(media) - .post(Entity.entity(toJsonRoot(rsci, ReservationSubmissionRequestInfo.class), + .post(Entity.entity(toJson(rsci, ReservationSubmissionRequestInfo.class), MediaType.APPLICATION_JSON_TYPE), Response.class); if (!this.isAuthenticationEnabled()) { @@ -1140,7 +1140,7 @@ private void updateReservationTestHelper(String path, Response response = constructWebResource(path) .request(MediaType.APPLICATION_JSON) .accept(media) - .post(Entity.entity(toJsonRoot(rsci, ReservationUpdateRequestInfo.class), + .post(Entity.entity(toJson(rsci, ReservationUpdateRequestInfo.class), MediaType.APPLICATION_JSON_TYPE), Response.class); if (!this.isAuthenticationEnabled()) { @@ -1198,7 +1198,7 @@ private void testDeleteReservationHelper(String path, Response response = constructWebResource(path) .request(MediaType.APPLICATION_JSON) .accept(media) - .post(Entity.entity(toJsonRoot(rsci, ReservationDeleteRequestInfo.class), + .post(Entity.entity(toJson(rsci, ReservationDeleteRequestInfo.class), MediaType.APPLICATION_JSON_TYPE), Response.class); if (!this.isAuthenticationEnabled()) { assertResponseStatusCode(Response.Status.UNAUTHORIZED, response.getStatusInfo()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebappAuthentication.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebappAuthentication.java index 16427dce4f365..8a56ca3ec49f9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebappAuthentication.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebappAuthentication.java @@ -18,7 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJsonNoRoot; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -200,7 +200,7 @@ private void testAnonymousKerberosUser() throws Exception { AppState appState = new AppState(); appState.setState("KILLED"); - requestBody = toJsonNoRoot(appState, AppState.class); + requestBody = toJson(appState, AppState.class); url = new URL("http://localhost:8088/ws/v1/cluster/apps/application_123_0/state"); conn = (HttpURLConnection) url.openConnection(); TestRMWebServicesDelegationTokenAuthentication.setupConn(conn, "PUT", diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java index d25fb5563a9f8..820aa7a587112 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java @@ -36,6 +36,7 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.parsers.DocumentBuilder; @@ -53,7 +54,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.SerializationFeature; -import com.google.gson.Gson; +import org.eclipse.persistence.jaxb.MarshallerProperties; import org.glassfish.jersey.jettison.JettisonJaxbContext; import org.glassfish.jersey.jettison.JettisonMarshaller; import org.w3c.dom.Document; @@ -345,31 +346,31 @@ public static void restoreSchedulerConfigFileInTarget() { public static String toEntity(Object obj, Class klass, String mediaType) throws Exception { - if (mediaType == MediaType.APPLICATION_JSON) { - return toJsonNoRoot(obj, klass); + if (MediaType.APPLICATION_JSON.equals(mediaType)) { + return toJson(obj, klass); } - if(mediaType == MediaType.APPLICATION_XML) { + if(MediaType.APPLICATION_XML.equals(mediaType)) { return toXml(obj, klass); } return null; } - public static String toJsonRoot(Object obj, Class klass) throws Exception { + public static String toJson(Object obj, Class klass) throws Exception { + JAXBContext jc = new JAXBContextResolver().getContext(klass); + Marshaller marshaller = jc.createMarshaller(); + marshaller.setProperty(MarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_JSON); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); StringWriter stringWriter = new StringWriter(); - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(klass); - JettisonMarshaller jettisonMarshaller = jettisonJaxbContext.createJsonMarshaller(); - jettisonMarshaller.marshallToJSON(obj, stringWriter); + marshaller.marshal(obj, stringWriter); return stringWriter.toString(); } - public static String toJsonNoRoot(Object obj, Class klass) throws Exception { - return new Gson().toJson(obj, klass); - } - - public static String toXml(Object obj, Class klass) throws JAXBException { + public static String toXml(Object obj, Class klass) throws Exception { + JAXBContext jc = new JAXBContextResolver().getContext(klass); + Marshaller marshaller = jc.createMarshaller(); + marshaller.setProperty(MarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_XML); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); StringWriter stringWriter = new StringWriter(); - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(klass); - Marshaller marshaller = jettisonJaxbContext.createMarshaller(); marshaller.marshal(obj, stringWriter); return stringWriter.toString(); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/AppStateReader.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/AppStateReader.java deleted file mode 100644 index 3531fdb8557ea..0000000000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/AppStateReader.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.yarn.server.resourcemanager.webapp.reader; - -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.AppState; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonUnmarshaller; - -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBException; -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; - -/** - * We have defined a dedicated Reader for AppState, - * aimed at adapting to the Jersey2 framework - * to ensure that JSON can be converted into AppState. - */ -@Provider -@Consumes(MediaType.APPLICATION_JSON) -public class AppStateReader implements MessageBodyReader { - - private JettisonUnmarshaller jsonUnmarshaller; - - public AppStateReader() { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(AppState.class); - jsonUnmarshaller = jettisonJaxbContext.createJsonUnmarshaller(); - } catch (JAXBException e) { - } - } - - @Override - public boolean isReadable(Class type, Type genericType, Annotation[] annotations, - MediaType mediaType) { - return type == AppState.class; - } - - @Override - public AppState readFrom(Class type, Type genericType, Annotation[] annotations, - MediaType mediaType, MultivaluedMap httpHeaders, InputStream entityStream) - throws IOException, WebApplicationException { - try { - return jsonUnmarshaller.unmarshalFromJSON(entityStream, AppState.class); - } catch (JAXBException e) { - throw new IOException(e); - } - } -} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-0.json index b821aaa14ec39..7febd32875778 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-0.json @@ -91,26 +91,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -119,26 +112,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -566,26 +552,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -594,26 +573,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1025,26 +997,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1053,26 +1018,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1484,26 +1442,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1512,26 +1463,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1929,26 +1873,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1957,26 +1894,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2247,26 +2177,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2275,26 +2198,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2666,26 +2582,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2694,26 +2603,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-16.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-16.json index 400181bcbe05b..c1a4eed4cf9be 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-16.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-16.json @@ -91,26 +91,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -119,26 +112,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -566,26 +552,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -594,26 +573,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1025,26 +997,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1053,26 +1018,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1484,26 +1442,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1512,26 +1463,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1929,26 +1873,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1957,26 +1894,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2247,26 +2177,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2275,26 +2198,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2666,26 +2582,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2694,26 +2603,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-32.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-32.json index 8dfd8e726ed51..be45d10c04fbf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-32.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-32.json @@ -1,12 +1,12 @@ { "scheduler" : { "schedulerInfo" : { - "@xsi.type" : "capacityScheduler", - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "weight" : -1, - "normalizedWeight" : 0, + "type" : "capacityScheduler", + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", "capacityVectorEntries" : [ { @@ -23,16 +23,16 @@ "isAbsoluteResource" : false, "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.default", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "default", @@ -43,7 +43,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -51,7 +50,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -62,12 +60,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -80,20 +78,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 12.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -101,7 +98,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -116,7 +112,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -124,7 +119,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -139,7 +133,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -147,7 +140,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -162,7 +154,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -170,7 +161,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -180,17 +170,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -198,7 +187,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -213,7 +201,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -221,7 +208,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -236,7 +222,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -244,7 +229,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -259,7 +243,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -267,7 +250,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -282,7 +264,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -290,7 +271,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -305,7 +285,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -313,7 +292,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -323,14 +301,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 4096, "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -338,7 +315,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -353,7 +329,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -361,7 +336,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -376,7 +350,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -384,7 +357,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -409,29 +381,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 1250, "maxApplicationsPerUser" : 1250, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -439,7 +410,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -454,7 +424,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -462,7 +431,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -477,7 +445,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -485,7 +452,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -503,14 +469,14 @@ "defaultApplicationLifetime" : -1 }, { "queuePath" : "root.test1", - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1", @@ -518,16 +484,16 @@ "state" : "RUNNING", "queues" : { "queue" : [ { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_1", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_1", @@ -538,7 +504,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -546,7 +511,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -557,12 +521,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -575,20 +539,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -596,7 +559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -611,7 +573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -619,7 +580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -634,7 +594,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -642,7 +601,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -657,7 +615,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -665,7 +622,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -675,17 +631,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -693,7 +648,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -708,7 +662,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -716,7 +669,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -731,7 +683,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -739,7 +690,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -754,7 +704,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -762,7 +711,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -777,7 +725,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -785,7 +732,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -800,7 +746,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -808,7 +753,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -818,14 +762,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -833,7 +776,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -848,7 +790,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -856,7 +797,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -871,7 +811,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -879,7 +818,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -904,29 +842,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -934,7 +871,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -949,7 +885,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -957,7 +892,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -972,7 +906,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -980,7 +913,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -997,16 +929,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_2", "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_2", @@ -1017,7 +949,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1025,7 +956,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1036,12 +966,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=12.5%,vcores=12.5%]", @@ -1054,20 +984,19 @@ } ] }, "capacity" : 12.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 6.25, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1075,7 +1004,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1090,7 +1018,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1098,7 +1025,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1113,7 +1039,6 @@ "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1121,7 +1046,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1136,7 +1060,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1144,7 +1067,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1154,17 +1076,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1172,7 +1093,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1187,7 +1107,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1195,7 +1114,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1210,7 +1128,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1218,7 +1135,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1233,7 +1149,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1241,7 +1156,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1256,7 +1170,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1264,7 +1177,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1279,7 +1191,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1287,7 +1198,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1297,14 +1207,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 2048, "vCores" : 2, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1312,7 +1221,6 @@ "units" : "Mi", "value" : 2048 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1327,7 +1235,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1335,7 +1242,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1350,7 +1256,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1358,7 +1263,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1383,29 +1287,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 625, "maxApplicationsPerUser" : 625, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1413,7 +1316,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1428,7 +1330,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1436,7 +1337,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1451,7 +1351,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1459,7 +1358,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1476,16 +1374,16 @@ "maxApplicationLifetime" : -1, "defaultApplicationLifetime" : -1 }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test1.test1_3", - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test1_3", @@ -1496,7 +1394,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1504,7 +1401,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1515,12 +1411,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=75.0%,vcores=75.0%]", @@ -1532,21 +1428,20 @@ "resourceValue" : "75.0%" } ] }, - "capacity" : 75, - "usedCapacity" : 0, - "maxCapacity" : 100, + "capacity" : 75.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1554,7 +1449,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1569,7 +1463,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -1577,7 +1470,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -1592,7 +1484,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1600,7 +1491,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1615,7 +1505,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1623,7 +1512,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1633,17 +1521,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1651,7 +1538,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1666,7 +1552,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1674,7 +1559,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1689,7 +1573,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1697,7 +1580,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1712,7 +1594,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1720,7 +1601,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1735,7 +1615,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1743,7 +1622,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1758,7 +1636,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1766,7 +1643,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1776,14 +1652,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1791,7 +1666,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1806,7 +1680,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1814,7 +1687,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1829,7 +1701,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1837,7 +1708,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1862,29 +1732,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1892,7 +1761,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1907,7 +1775,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1915,7 +1782,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1930,7 +1796,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1938,7 +1803,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1961,7 +1825,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -1969,7 +1832,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -1980,12 +1842,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", @@ -1997,21 +1859,20 @@ "resourceValue" : "50.0%" } ] }, - "capacity" : 50, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 50, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 50.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 50.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2019,7 +1880,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2034,7 +1894,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2042,7 +1901,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2057,7 +1915,6 @@ "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2065,7 +1922,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2080,7 +1936,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2088,7 +1943,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2098,17 +1952,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2116,7 +1969,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2131,7 +1983,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2139,7 +1990,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2154,7 +2004,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2162,7 +2011,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2172,14 +2020,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 16384, "vCores" : 16, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2187,7 +2034,6 @@ "units" : "Mi", "value" : 16384 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2202,7 +2048,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2210,7 +2055,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2225,7 +2069,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2233,7 +2076,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2258,25 +2100,25 @@ "queuePriority" : 0, "orderingPolicyInfo" : "utilization", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } }, { - "@xsi.type" : "capacitySchedulerLeafQueueInfo", + "type" : "capacitySchedulerLeafQueueInfo", "queuePath" : "root.test2", "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteMaxCapacity" : 100, - "absoluteUsedCapacity" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteMaxCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "numApplications" : 0, "maxParallelApps" : 2147483647, "queueName" : "test2", @@ -2287,7 +2129,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2295,7 +2136,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2306,12 +2146,12 @@ } }, "hideReservationQueues" : false, - "nodeLabels" : "*", + "nodeLabels" : [ "*" ], "allocatedContainers" : 0, "reservedContainers" : 0, "pendingContainers" : 0, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=37.5%,vcores=37.5%]", @@ -2324,20 +2164,19 @@ } ] }, "capacity" : 37.5, - "usedCapacity" : 0, - "maxCapacity" : 100, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, "absoluteCapacity" : 37.5, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 10, - "weight" : -1, - "normalizedWeight" : 0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 10.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2345,7 +2184,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2360,7 +2198,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2368,7 +2205,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2383,7 +2219,6 @@ "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2391,7 +2226,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2406,7 +2240,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2414,7 +2247,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2424,17 +2256,16 @@ } ] } } - } + } ] }, "resources" : { - "resourceUsagesByPartition" : { + "resourceUsagesByPartition" : [ { "partitionName" : "", "used" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2442,7 +2273,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2457,7 +2287,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2465,7 +2294,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2480,7 +2308,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2488,7 +2315,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2503,7 +2329,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2511,7 +2336,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2526,7 +2350,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2534,7 +2357,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2549,7 +2371,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2557,7 +2378,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2567,14 +2387,13 @@ } ] } } - } + } ] }, "minEffectiveCapacity" : { "memory" : 12288, "vCores" : 12, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2582,7 +2401,6 @@ "units" : "Mi", "value" : 12288 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2597,7 +2415,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2605,7 +2422,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2620,7 +2436,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2628,7 +2443,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2653,29 +2467,28 @@ "queuePriority" : 0, "orderingPolicyInfo" : "fifo", "autoCreateChildQueueEnabled" : false, - "leafQueueTemplate" : "", + "leafQueueTemplate" : { }, "mode" : "percentage", "queueType" : "leaf", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "", + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { }, "numActiveApplications" : 0, "numPendingApplications" : 0, "numContainers" : 0, "maxApplications" : 3750, "maxApplicationsPerUser" : 3750, - "userLimit" : 100, - "users" : "", - "userLimitFactor" : 1, + "userLimit" : 100.0, + "users" : { }, + "userLimitFactor" : 1.0, "configuredMaxAMResourceLimit" : 0.1, "AMResourceLimit" : { "memory" : 4096, "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2683,7 +2496,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2698,7 +2510,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2706,7 +2517,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2721,7 +2531,6 @@ "vCores" : 1, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2729,7 +2538,6 @@ "units" : "Mi", "value" : 4096 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2748,7 +2556,7 @@ } ] }, "capacities" : { - "queueCapacitiesByPartition" : { + "queueCapacitiesByPartition" : [ { "partitionName" : "", "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", @@ -2760,21 +2568,20 @@ "resourceValue" : "100.0%" } ] }, - "capacity" : 100, - "usedCapacity" : 0, - "maxCapacity" : 100, - "absoluteCapacity" : 100, - "absoluteUsedCapacity" : 0, - "absoluteMaxCapacity" : 100, - "maxAMLimitPercentage" : 0, - "weight" : -1, - "normalizedWeight" : 0, + "capacity" : 100.0, + "usedCapacity" : 0.0, + "maxCapacity" : 100.0, + "absoluteCapacity" : 100.0, + "absoluteUsedCapacity" : 0.0, + "absoluteMaxCapacity" : 100.0, + "maxAMLimitPercentage" : 0.0, + "weight" : -1.0, + "normalizedWeight" : 0.0, "configuredMinResource" : { "memory" : 0, "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2782,7 +2589,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2797,7 +2603,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 8192, "minimumAllocation" : 1024, "name" : "memory-mb", @@ -2805,7 +2610,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 4, "minimumAllocation" : 1, "name" : "vcores", @@ -2820,7 +2624,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2828,7 +2631,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2843,7 +2645,6 @@ "vCores" : 32, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2851,7 +2652,6 @@ "units" : "Mi", "value" : 32768 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2861,7 +2661,7 @@ } ] } } - } + } ] }, "health" : { "lastrun" : 0, @@ -2894,7 +2694,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2902,7 +2701,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2920,7 +2718,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2928,7 +2725,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2946,7 +2742,6 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2954,7 +2749,6 @@ "units" : "Mi", "value" : 0 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -2971,7 +2765,6 @@ "vCores" : 4, "resourceInformations" : { "resourceInformation" : [ { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "memory-mb", @@ -2979,7 +2772,6 @@ "units" : "Mi", "value" : 8192 }, { - "attributes" : "", "maximumAllocation" : 9223372036854775807, "minimumAllocation" : 0, "name" : "vcores", @@ -3007,9 +2799,9 @@ "queueType" : "parent", "creationMethod" : "static", "autoCreationEligibility" : "off", - "autoQueueTemplateProperties" : "", - "autoQueueParentTemplateProperties" : "", - "autoQueueLeafTemplateProperties" : "" + "autoQueueTemplateProperties" : { }, + "autoQueueParentTemplateProperties" : { }, + "autoQueueLeafTemplateProperties" : { } } } } \ No newline at end of file diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-legacy-0.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-legacy-0.json index f581827546f06..94c7381604c8d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-legacy-0.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/dynamic-testPercentageMode-legacy-0.json @@ -91,26 +91,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -119,26 +112,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -566,26 +552,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -594,26 +573,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1025,26 +997,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1053,26 +1018,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1484,26 +1442,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1512,26 +1463,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1929,26 +1873,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -1957,26 +1894,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2247,26 +2177,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2275,26 +2198,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2666,26 +2582,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, @@ -2694,26 +2603,19 @@ "vCores" : 0, "resourceInformations" : { "resourceInformation" : [ { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 8192, + "minimumAllocation" : 1024, "name" : "memory-mb", "resourceType" : "COUNTABLE", "units" : "Mi", "value" : 0 }, { - "maximumAllocation" : 9223372036854775807, - "minimumAllocation" : 0, + "maximumAllocation" : 4, + "minimumAllocation" : 1, "name" : "vcores", "resourceType" : "COUNTABLE", "units" : "", "value" : 0 - }, { - "maximumAllocation" : 2147483647, - "minimumAllocation" : 0, - "name" : "yarn.io/gpu", - "resourceType" : "COUNTABLE", - "units" : "", - "value" : 0 } ] } }, From 5bc92110f6b60caf312c650041e3e89cb9a43a44 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Thu, 16 Oct 2025 14:13:12 +0200 Subject: [PATCH 04/19] Delete helper marshallers --- .../webapp/TestRMWebServiceAppsNodelabel.java | 5 +- .../webapp/TestRMWebServices.java | 27 ++--- .../webapp/TestRMWebServicesAppAttempts.java | 11 +- .../webapp/TestRMWebServicesApps.java | 107 +++++++++--------- .../TestRMWebServicesAppsModification.java | 11 +- .../TestRMWebServicesCapacitySched.java | 8 +- ...MWebServicesCapacitySchedDefaultLabel.java | 5 - ...WebServicesCapacitySchedDynamicConfig.java | 5 - ...apacitySchedDynamicConfigAbsoluteMode.java | 3 - ...sCapacitySchedDynamicConfigWeightMode.java | 5 - ...pacitySchedDynamicConfigWeightModeDQC.java | 5 - ...vicesCapacitySchedLegacyQueueCreation.java | 5 - ...rvicesCapacitySchedulerConfigMutation.java | 4 - ...estRMWebServicesConfigurationMutation.java | 5 +- .../webapp/TestRMWebServicesContainers.java | 5 - .../TestRMWebServicesDelegationTokens.java | 4 +- .../TestRMWebServicesForCSWithPartitions.java | 7 +- .../webapp/TestRMWebServicesNodeLabels.java | 12 +- .../webapp/TestRMWebServicesNodes.java | 36 +++--- .../webapp/TestRMWebServicesReservation.java | 3 +- .../TestRMWebServicesSchedulerActivities.java | 45 ++++---- ...edulerActivitiesWithMultiNodesEnabled.java | 9 +- .../webapp/TestWebServiceUtil.java | 11 ++ .../TestRMWebServicesFairScheduler.java | 9 +- ...pplicationSubmissionContextInfoReader.java | 75 ------------ .../reader/LabelsToNodesInfoReader.java | 74 ------------ .../webapp/reader/NodeLabelsInfoReader.java | 74 ------------ .../webapp/reader/NodeToLabelsInfoReader.java | 74 ------------ .../reader/ResourceOptionInfoReader.java | 74 ------------ ...pplicationSubmissionContextInfoWriter.java | 89 --------------- .../writer/ResourceOptionInfoWriter.java | 87 -------------- .../writer/SchedConfUpdateInfoWriter.java | 87 -------------- 32 files changed, 158 insertions(+), 823 deletions(-) delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/ApplicationSubmissionContextInfoReader.java delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/LabelsToNodesInfoReader.java delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/NodeLabelsInfoReader.java delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/NodeToLabelsInfoReader.java delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/ResourceOptionInfoReader.java delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/ApplicationSubmissionContextInfoWriter.java delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/ResourceOptionInfoWriter.java delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/SchedConfUpdateInfoWriter.java diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java index a3e6cf99988cc..6fc73ea019f73 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -154,7 +155,7 @@ public void testAppsFinished() throws JSONException, Exception { Response response = r.path("ws").path("v1").path("cluster").path("apps") .request(MediaType.APPLICATION_JSON).get(Response.class); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); try { @@ -195,7 +196,7 @@ public void testAppsRunning() throws JSONException, Exception { Response response = r.path("ws").path("v1").path("cluster").path("apps") .request(MediaType.APPLICATION_JSON).get(Response.class); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); // Verify apps resource JSONObject apps = json.getJSONObject("apps"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java index d8f8bf12ce88c..e4b4e7b7ba533 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -244,7 +245,7 @@ public void testCluster() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterInfo(json); } @@ -257,7 +258,7 @@ public void testClusterSlash() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterInfo(json); } @@ -270,7 +271,7 @@ public void testClusterDefault() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterInfo(json); } @@ -283,7 +284,7 @@ public void testInfo() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterInfo(json); } @@ -297,7 +298,7 @@ public void testInfoSlash() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterInfo(json); } @@ -309,7 +310,7 @@ public void testInfoDefault() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterInfo(json); } @@ -397,7 +398,7 @@ public void testClusterMetrics() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterMetricsJSON(json); } @@ -410,7 +411,7 @@ public void testClusterMetricsSlash() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterMetricsJSON(json); } @@ -422,7 +423,7 @@ public void testClusterMetricsDefault() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json =response.readEntity(JSONObject.class); + JSONObject json =responseToJson(response); verifyClusterMetricsJSON(json); } @@ -554,7 +555,7 @@ public void testClusterSchedulerFifo() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterSchedulerFifo(json); } @@ -567,7 +568,7 @@ public void testClusterSchedulerFifoSlash() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterSchedulerFifo(json); } @@ -579,7 +580,7 @@ public void testClusterSchedulerFifoDefault() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterSchedulerFifo(json); } @@ -1091,7 +1092,7 @@ public void testClusterSchedulerOverviewFifo() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONObject schedulerJson = json.getJSONObject("scheduler"); verifyClusterSchedulerOverView(schedulerJson, "Fifo Scheduler"); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java index b8730d0bfa3ef..04f23952bee82 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java @@ -64,6 +64,7 @@ import java.io.StringReader; import java.util.Collection; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.checkStringMatch; import static org.assertj.core.api.Assertions.assertThat; @@ -155,7 +156,7 @@ public void testCompletedAppAttempt() throws Exception { .path("apps").path(app1.getApplicationId().toString()) .path("appattempts").request(MediaType.APPLICATION_JSON) .get(Response.class); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONObject jsonAppAttempts = json.getJSONObject("appAttempts"); JSONArray jsonArray = jsonAppAttempts.getJSONArray("appAttempt"); JSONObject info = jsonArray.getJSONObject(0); @@ -247,7 +248,7 @@ public void testInvalidAppIdGetAttempts() throws Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -284,7 +285,7 @@ public void testInvalidAppAttemptId() throws Exception { response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -325,7 +326,7 @@ public void testNonexistAppAttempts() throws Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -349,7 +350,7 @@ private void testAppAttemptsHelper(String path, RMApp app, String media) .get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject jsonAppAttempts = json.getJSONObject("appAttempts"); assertEquals(1, jsonAppAttempts.length(), "incorrect number of elements"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 62b4116a52d09..6e95e668cac6f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -73,6 +73,7 @@ import java.util.Arrays; import java.util.Set; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -279,7 +280,7 @@ public void testAppsHelper(String path, RMApp app, String media, .path(path).request(media).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -303,7 +304,7 @@ public void testAppsQueryState() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -329,7 +330,7 @@ public void testAppsQueryStates() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -345,7 +346,7 @@ public void testAppsQueryStates() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -377,7 +378,7 @@ public void testAppsQueryStatesComma() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -393,7 +394,7 @@ public void testAppsQueryStatesComma() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -423,7 +424,7 @@ public void testAppsQueryStatesNone() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty"); rm.stop(); @@ -443,7 +444,7 @@ public void testAppsQueryStateNone() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty"); rm.stop(); @@ -467,7 +468,7 @@ public void testAppsQueryStatesInvalid() throws JSONException, Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -503,7 +504,7 @@ public void testAppsQueryStateInvalid() throws JSONException, Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -534,7 +535,7 @@ public void testAppsQueryFinalStatus() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -557,7 +558,7 @@ public void testAppsQueryFinalStatusNone() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not null"); rm.stop(); @@ -581,7 +582,7 @@ public void testAppsQueryFinalStatusInvalid() throws Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -618,7 +619,7 @@ public void testAppsQueryUser() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); @@ -643,7 +644,7 @@ public void testAppsQueryQueue() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -672,7 +673,7 @@ public void testAppsQueryQueueAndStateTwoFinishedApps() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -707,7 +708,7 @@ public void testAppsQueryQueueAndStateOneFinishedApp() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -742,7 +743,7 @@ public void testAppsQueryQueueOneFinishedApp() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -772,7 +773,7 @@ public void testAppsQueryLimit() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -796,7 +797,7 @@ public void testAppsQueryStartBegin() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -820,7 +821,7 @@ public void testAppsQueryStartBeginSome() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -844,7 +845,7 @@ public void testAppsQueryStartEnd() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty"); rm.stop(); @@ -868,7 +869,7 @@ public void testAppsQueryStartBeginEnd() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -895,7 +896,7 @@ public void testAppsQueryFinishBegin() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -933,7 +934,7 @@ public void testAppsQueryFinishEnd() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -964,7 +965,7 @@ public void testAppsQueryFinishBeginEnd() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1014,7 +1015,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1030,7 +1031,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1050,7 +1051,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1069,7 +1070,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1084,7 +1085,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1099,7 +1100,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1115,7 +1116,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1130,7 +1131,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1143,7 +1144,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1164,7 +1165,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1195,7 +1196,7 @@ public void testAppsQueryWithInvalidDeselects() assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -1230,7 +1231,7 @@ public void testAppsQueryWithDeselects() assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1245,7 +1246,7 @@ public void testAppsQueryWithDeselects() assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1261,7 +1262,7 @@ public void testAppsQueryWithDeselects() assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1278,7 +1279,7 @@ public void testAppsQueryWithDeselects() assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1295,7 +1296,7 @@ public void testAppsQueryWithDeselects() assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1359,7 +1360,7 @@ public void testAppStatistics() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject appsStatInfo = json.getJSONObject("appStatInfo"); assertEquals(1, appsStatInfo.length(), "incorrect number of elements"); @@ -1386,7 +1387,7 @@ public void testAppStatistics() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); appsStatInfo = json.getJSONObject("appStatInfo"); assertEquals(1, appsStatInfo.length(), "incorrect number of elements"); @@ -1404,7 +1405,7 @@ public void testAppStatistics() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); appsStatInfo = json.getJSONObject("appStatInfo"); assertEquals(1, appsStatInfo.length(), "incorrect number of elements"); @@ -1432,7 +1433,7 @@ public void testAppStatistics() throws JSONException, Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject exception = json.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); @@ -1456,7 +1457,7 @@ public void testAppStatistics() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); appsStatInfo = json.getJSONObject("appStatInfo"); assertEquals(1, appsStatInfo.length(), "incorrect number of elements"); @@ -1481,7 +1482,7 @@ public void testAppStatistics() throws JSONException, Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); exception = json.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); @@ -1583,7 +1584,7 @@ public void testInvalidApp() throws JSONException, Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -1625,7 +1626,7 @@ public void testNonexistApp() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -1649,7 +1650,7 @@ public void testSingleAppsHelper(String path, RMApp app, String media) .path("apps").path(path).request(media).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); verifyAppInfo(json.getJSONObject("app"), app, false); @@ -1967,7 +1968,7 @@ public void testAppsQueryByQueueShortname() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -2032,7 +2033,7 @@ public void testAppsQueryByQueueFullname() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index 81783da272df9..1063f364eee43 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -527,7 +528,7 @@ protected static void verifyAppStateJson(Response response, assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); String responseState = json.getString("state"); boolean valid = false; @@ -1299,7 +1300,7 @@ protected static void verifyAppPriorityJson(Response response, int expectedPriority) throws JSONException { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); int responsePriority = json.getInt("priority"); assertEquals(expectedPriority, responsePriority); @@ -1327,7 +1328,7 @@ protected static void verifyAppQueueJson(Response response, String queue) throws JSONException { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); String responseQueue = json.getString("queue"); assertEquals(queue, responseQueue); @@ -1379,7 +1380,7 @@ public void testUpdateAppTimeout(int run) throws Exception { MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); JSONObject js = - response.readEntity(JSONObject.class).getJSONObject("timeouts"); + responseToJson(response).getJSONObject("timeouts"); JSONArray entity = js.getJSONArray("timeout"); verifyAppTimeoutJson(entity.getJSONObject(0), ApplicationTimeoutType.LIFETIME, "UNLIMITED", -1); @@ -1456,7 +1457,7 @@ protected static void verifyAppTimeoutJson(Response response, throws JSONException { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject jsonTimeout = response.readEntity(JSONObject.class); + JSONObject jsonTimeout = responseToJson(response); assertEquals(1, jsonTimeout.length(), "incorrect number of elements"); JSONObject json = jsonTimeout.getJSONObject("timeout"); verifyAppTimeoutJson(json, type, expireTime, timeOutFromNow); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index 6fd3721209573..ce3408c6d1dc7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -32,12 +32,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.codehaus.jettison.json.JSONObject; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; @@ -58,6 +55,7 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.assertXmlResponse; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.backupSchedulerConfigFileInTarget; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.createRM; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.restoreSchedulerConfigFileInTarget; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; @@ -79,8 +77,6 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(ApplicationSubmissionContextInfoWriter.class); - config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); config.register(JsonProviderFeature.class); return config; @@ -184,7 +180,7 @@ public void testClusterSchedulerOverviewCapacity(boolean pLegacyQueueMode) throw Response response = targetWithJsonObject().path("ws/v1/cluster/scheduler-overview") .request(MediaType.APPLICATION_JSON).get(Response.class); assertJsonType(response); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONObject scheduler = json.getJSONObject("scheduler"); TestRMWebServices.verifyClusterSchedulerOverView(scheduler, "Capacity Scheduler"); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDefaultLabel.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDefaultLabel.java index 1a881540f7acd..9e1d3d3f32f6f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDefaultLabel.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDefaultLabel.java @@ -25,12 +25,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePath; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.params.ParameterizedTest; @@ -70,8 +67,6 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(ApplicationSubmissionContextInfoWriter.class); - config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); config.register(JsonProviderFeature.class); return config; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java index 8e0d417e6433d..bf95db64a899f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfig.java @@ -26,11 +26,8 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; @@ -92,8 +89,6 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(ApplicationSubmissionContextInfoWriter.class); - config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); config.register(JsonProviderFeature.class); config.register(JAXBContextResolver.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigAbsoluteMode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigAbsoluteMode.java index 84b170cdf6184..3268be75fb385 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigAbsoluteMode.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigAbsoluteMode.java @@ -25,12 +25,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.params.ParameterizedTest; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightMode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightMode.java index d6072e4b5beff..4324b24c7c16f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightMode.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightMode.java @@ -25,12 +25,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.params.ParameterizedTest; @@ -91,8 +88,6 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(ApplicationSubmissionContextInfoWriter.class); - config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); config.register(JsonProviderFeature.class); config.register(JAXBContextResolver.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightModeDQC.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightModeDQC.java index 333a6e95cdcbd..99d0dc3b6179e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightModeDQC.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedDynamicConfigWeightModeDQC.java @@ -27,12 +27,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerQueueManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePath; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.params.ParameterizedTest; @@ -102,8 +99,6 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(ApplicationSubmissionContextInfoWriter.class); - config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); config.register(JsonProviderFeature.class); config.register(JAXBContextResolver.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreation.java index 561ce51d2bc38..870b897babaa9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreation.java @@ -32,11 +32,8 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; @@ -71,8 +68,6 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(ApplicationSubmissionContextInfoWriter.class); - config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); config.register(JsonProviderFeature.class); config.register(JAXBContextResolver.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java index 773e81dfaeee5..4f252bfd3ec33 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java @@ -37,14 +37,10 @@ import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.SchedConfUpdateInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.dao.QueueConfigInfo; import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java index 8ffd187d7a494..e788f48689110 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java @@ -72,6 +72,7 @@ import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.MAXIMUM_CAPACITY; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.getCapacitySchedulerConfigFileInTarget; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.backupSchedulerConfigFileInTarget; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.restoreSchedulerConfigFileInTarget; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -205,7 +206,7 @@ private CapacitySchedulerConfiguration getSchedulerConf() .request(MediaType.APPLICATION_JSON) .get(Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONArray items = (JSONArray) json.get("property"); CapacitySchedulerConfiguration parsedConf = new CapacitySchedulerConfiguration(); @@ -272,7 +273,7 @@ private long getConfigVersion() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); - JSONObject json = response.readEntity(JSONObject.class). + JSONObject json = responseToJson(response). getJSONObject("configversion"); return Long.parseLong(json.get("versionID").toString()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesContainers.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesContainers.java index d9158f00a1c33..a77d0add7ef5b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesContainers.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesContainers.java @@ -47,15 +47,12 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ApplicationSubmissionContextInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ApplicationSubmissionContextInfoWriter; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; @@ -73,8 +70,6 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(ApplicationSubmissionContextInfoWriter.class); - config.register(ApplicationSubmissionContextInfoReader.class); config.register(TestRMWebServicesAppsModification.TestRMCustomAuthFilter.class); config.register(JsonProviderFeature.class); config.register(JAXBContextResolver.class); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java index 51aac290b465d..dd02e7eab61e7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.createRM; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import java.io.File; @@ -748,8 +749,7 @@ private void verifySimpleAuthCancel() { throws IOException, ParserConfigurationException, SAXException, JSONException { if (response.getMediaType().toString().contains(MediaType.APPLICATION_JSON)) { - return getDelegationTokenFromJson( - response.readEntity(JSONObject.class)); + return getDelegationTokenFromJson(responseToJson(response)); } return getDelegationTokenFromXML(response.readEntity(String.class)); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java index dcfd79fdc900e..ee691bc61f248 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java @@ -26,6 +26,7 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.getFirstSubNodeFromJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyNumberOfAllocations; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.createRM; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -285,7 +286,7 @@ public void testSchedulerPartitions(boolean pLegacyQueueMode) throws JSONExcepti .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifySchedulerInfoJson(json); } @@ -300,7 +301,7 @@ public void testSchedulerPartitionsSlash(boolean pLegacyQueueMode) .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifySchedulerInfoJson(json); } @@ -315,7 +316,7 @@ public void testSchedulerPartitionsDefault(boolean pLegacyQueueMode) .path("scheduler").request().get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifySchedulerInfoJson(json); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java index 76b00d109d9a7..117762527e179 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -26,7 +27,6 @@ import static org.mockito.Mockito.when; import java.io.IOException; -import java.io.StringWriter; import java.security.Principal; import java.util.ArrayList; import java.util.List; @@ -61,12 +61,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntry; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.NodeLabelsInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.LabelsToNodesInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.NodeToLabelsInfoReader; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; @@ -76,9 +71,6 @@ import org.junit.jupiter.api.Test; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonMarshaller; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; public class TestRMWebServicesNodeLabels extends JerseyTestBase { @@ -625,7 +617,7 @@ private void validateJsonExceptionContent(Response response, String expectedMessage) throws JSONException { assertEquals(BAD_REQUEST_CODE, response.getStatus()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); String message = exception.getString("message"); assertEquals(3, exception.length(), "incorrect number of elements"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index fa64a2bf47eaf..3e1aaa10d35fa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import static org.apache.hadoop.yarn.server.resourcemanager.MockNM.createMockNodeStatus; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.assertj.core.api.Assertions.assertThat; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -89,8 +90,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.ResourceOptionInfoReader; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.writer.ResourceOptionInfoWriter; import org.apache.hadoop.yarn.util.Records; import org.apache.hadoop.yarn.util.RackResolver; import org.apache.hadoop.yarn.util.resource.Resources; @@ -110,7 +109,6 @@ import org.apache.hadoop.thirdparty.com.google.common.base.Joiner; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; @@ -240,7 +238,7 @@ public void testNodesDefaultWithUnHealthyNode() throws JSONException, assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); @@ -290,7 +288,7 @@ public void testNodesQueryNew() throws Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); @@ -313,7 +311,7 @@ public void testNodesQueryStateNone() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals(new JSONObject().toString(), json.get("nodes").toString(), "nodes is not empty"); } @@ -364,7 +362,7 @@ public void testNodesQueryStateLost() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); JSONArray nodeArray = nodes.getJSONArray("node"); @@ -396,7 +394,7 @@ public void testSingleNodeQueryStateLost() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONObject info = json.getJSONObject("node"); String id = info.get("id").toString(); @@ -423,7 +421,7 @@ public void testNodesQueryRunning() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); @@ -442,7 +440,7 @@ public void testNodesQueryHealthyFalse() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals(new JSONObject().toString(), json.get("nodes").toString(), "nodes is not empty"); } @@ -457,7 +455,7 @@ public void testNodesHelper(String path, String media) throws JSONException, .path(path).request(media).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); @@ -504,7 +502,7 @@ public void testSingleNodeHelper(String nodeid, RMNode nm, String media) assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject info = json.getJSONObject("node"); verifyNodeInfo(info, nm); @@ -524,7 +522,7 @@ public void testNonexistNode() throws Exception { assertResponseStatusCode(Response.Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -546,7 +544,7 @@ public void testNonexistNodeDefault() throws Exception { assertResponseStatusCode(Response.Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -599,7 +597,7 @@ public void testInvalidNode() throws Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = response.readEntity(JSONObject.class); + JSONObject msg = responseToJson(response); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -699,7 +697,7 @@ public void testQueryAll() throws Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); JSONArray nodeArray = nodes.getJSONArray("node"); @@ -732,7 +730,7 @@ public void testNodesResourceUtilization() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); @@ -792,7 +790,7 @@ public void testUpdateNodeResource() throws Exception { .request(MediaType.APPLICATION_JSON) .post(Entity.json(resourceOption), Response.class); assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONObject exception = json.getJSONObject("RemoteException"); assertEquals("IllegalArgumentException", exception.getString("exception")); String msg = exception.getString("message"); @@ -968,7 +966,7 @@ public void testNodesAllocationTags() throws Exception { .path("nodes").request("application/json").get(Response.class); assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject nodesInfoJson = response.readEntity(JSONObject.class); + JSONObject nodesInfoJson = responseToJson(response); verifyNodeAllocationTag(nodesInfoJson, expectedAllocationTags); rm.stop(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index 9339ad490796f..ad1f8737ec7f3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.assertj.core.api.Assertions.assertThat; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; @@ -1240,7 +1241,7 @@ private JSONObject testListReservationHelper(WebTarget target, Response.Status response.getMediaType().toString()); assertResponseStatusCode(status, response.getStatusInfo()); - return response.readEntity(JSONObject.class); + return responseToJson(response); } private void verifyReservationCount(int count) throws Exception { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java index 4dd7110da4fe6..fc0a764fddeb3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java @@ -32,7 +32,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityState; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.reader.NodeLabelsInfoReader; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.junit.jupiter.api.BeforeEach; @@ -101,6 +100,7 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyNumberOfNodes; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyQueueOrder; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyStateOfAllocations; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -120,7 +120,6 @@ protected Application configure() { config.register(RMWebServices.class); config.register(new JerseyBinder()); config.register(GenericExceptionHandler.class); - config.register(NodeLabelsInfoReader.class); config.register(JsonProviderFeature.class); config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); @@ -232,7 +231,7 @@ public void testAssignMultipleContainersPerNodeHeartbeat() MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); nm.nodeHeartbeat(true); Thread.sleep(1000); @@ -243,7 +242,7 @@ public void testAssignMultipleContainersPerNodeHeartbeat() MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); // Collection logic of scheduler activities changed after YARN-9313, // only one allocation should be recorded for all scenarios. @@ -296,7 +295,7 @@ public void testAssignWithoutAvailableResource() throws Exception { request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); nm.nodeHeartbeat(true); Thread.sleep(1000); @@ -307,7 +306,7 @@ public void testAssignWithoutAvailableResource() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); // verify scheduler activities verifyNumberOfAllocations(json, 1); @@ -335,7 +334,7 @@ public void testNoNM() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); Thread.sleep(1000); @@ -345,7 +344,7 @@ public void testNoNM() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); verifyNumberOfAllocations(json, 0); } finally { @@ -388,7 +387,7 @@ public void testWrongNodeId() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); nm.nodeHeartbeat(true); Thread.sleep(1000); @@ -399,7 +398,7 @@ public void testWrongNodeId() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); verifyNumberOfAllocations(json, 0); } finally { @@ -454,7 +453,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); nm2.nodeHeartbeat(true); Thread.sleep(1000); @@ -464,7 +463,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); verifyNumberOfAllocations(json, 1); @@ -482,7 +481,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); nm2.nodeHeartbeat(true); Thread.sleep(1000); @@ -492,7 +491,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); verifyNumberOfAllocations(json, 1); @@ -517,7 +516,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); nm2.nodeHeartbeat(true); Thread.sleep(1000); @@ -527,7 +526,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); verifyNumberOfAllocations(json, 1); @@ -568,7 +567,7 @@ public void testActivityJSON() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); nm.nodeHeartbeat(true); Thread.sleep(1000); @@ -579,7 +578,7 @@ public void testActivityJSON() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); verifyNumberOfAllocations(json, 1); @@ -895,7 +894,7 @@ public void testInsufficientResourceDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals("waiting for next allocation", getFirstSubNodeFromJson(json, FN_SCHEDULER_ACT_ROOT) .optString(FN_ACT_DIAGNOSTIC)); @@ -913,7 +912,7 @@ public void testInsufficientResourceDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); verifyNumberOfAllocations(json, 1); JSONObject allocationObj = getFirstSubNodeFromJson(json, @@ -969,7 +968,7 @@ public void testPlacementConstraintDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals("waiting for next allocation", getFirstSubNodeFromJson(json, FN_SCHEDULER_ACT_ROOT) .optString(FN_ACT_DIAGNOSTIC)); @@ -983,7 +982,7 @@ public void testPlacementConstraintDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); verifyNumberOfAllocations(json, 1); JSONObject allocationObj = getFirstSubNodeFromJson(json, @@ -1766,7 +1765,7 @@ public void run() { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); done = true; } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java index ef3c1cbaf1c66..6bd84cfe88cf7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java @@ -83,6 +83,7 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyNumberOfAllocationAttempts; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyNumberOfAllocations; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyStateOfAllocations; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -218,7 +219,7 @@ public void testAssignContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyNumberOfAllocations(json, 1); @@ -262,7 +263,7 @@ public void testSchedulingWithoutPendingRequests() MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyNumberOfAllocations(json, 1); JSONObject allocation = getFirstSubNodeFromJson(json, @@ -376,7 +377,7 @@ public void testInsufficientResourceDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); assertEquals("waiting for next allocation", json.getJSONObject(FN_SCHEDULER_ACT_ROOT).getString("diagnostic")); @@ -390,7 +391,7 @@ public void testInsufficientResourceDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = response.readEntity(JSONObject.class); + json = responseToJson(response); //Check app activities verifyNumberOfAllocations(json, 1); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java index 820aa7a587112..3f358d8f7d18a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java @@ -54,6 +54,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.SerializationFeature; +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONObject; import org.eclipse.persistence.jaxb.MarshallerProperties; import org.glassfish.jersey.jettison.JettisonJaxbContext; import org.glassfish.jersey.jettison.JettisonMarshaller; @@ -344,6 +346,15 @@ public static void restoreSchedulerConfigFileInTarget() { } } + public static JSONObject responseToJson(Response response) { + String res = response.readEntity(String.class); + try { + return new JSONObject(res); + } catch (JSONException e) { + throw new RuntimeException("Failed to parse JSON: " + res, e); + } + } + public static String toEntity(Object obj, Class klass, String mediaType) throws Exception { if (MediaType.APPLICATION_JSON.equals(mediaType)) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java index 9366275d2569e..eb8c2faaacfd0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java @@ -49,6 +49,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; @@ -105,7 +106,7 @@ public void testClusterScheduler() throws JSONException { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterScheduler(json); } @@ -116,7 +117,7 @@ public void testClusterSchedulerSlash() throws JSONException { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); verifyClusterScheduler(json); } @@ -134,7 +135,7 @@ public void testClusterSchedulerWithSubQueues() .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONArray subQueueInfo = json.getJSONObject("scheduler") .getJSONObject("schedulerInfo").getJSONObject("rootQueue") .getJSONObject("childQueues").getJSONArray("queue").getJSONObject(0) @@ -170,7 +171,7 @@ public void testClusterSchedulerOverviewFair() throws Exception { .get(Response.class); assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + JSONObject json = responseToJson(response); JSONObject scheduler = json.getJSONObject("scheduler"); TestRMWebServices.verifyClusterSchedulerOverView(scheduler, "Fair Scheduler"); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/ApplicationSubmissionContextInfoReader.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/ApplicationSubmissionContextInfoReader.java deleted file mode 100644 index cf94940fe2e7a..0000000000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/ApplicationSubmissionContextInfoReader.java +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.yarn.server.resourcemanager.webapp.reader; - -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonUnmarshaller; - -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBException; -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; - -/** - * We have defined a dedicated Reader for ApplicationSubmissionContextInfo, - * aimed at adapting to the Jersey2 framework - * to ensure that JSON can be converted into ApplicationSubmissionContextInfo. - */ -@Provider -@Consumes(MediaType.APPLICATION_JSON) -public class ApplicationSubmissionContextInfoReader - implements MessageBodyReader { - - private JettisonUnmarshaller jsonUnmarshaller; - - public ApplicationSubmissionContextInfoReader() { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext( - ApplicationSubmissionContextInfo.class); - jsonUnmarshaller = jettisonJaxbContext.createJsonUnmarshaller(); - } catch (JAXBException e) { - } - } - - @Override - public boolean isReadable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - return type == ApplicationSubmissionContextInfo.class; - } - - @Override - public ApplicationSubmissionContextInfo readFrom(Class type, - Type genericType, Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, InputStream entityStream) - throws IOException, WebApplicationException { - try { - return jsonUnmarshaller.unmarshalFromJSON(entityStream, - ApplicationSubmissionContextInfo.class); - } catch (JAXBException e) { - throw new IOException(e); - } - } -} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/LabelsToNodesInfoReader.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/LabelsToNodesInfoReader.java deleted file mode 100644 index 7f8373205f82c..0000000000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/LabelsToNodesInfoReader.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.yarn.server.resourcemanager.webapp.reader; - -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LabelsToNodesInfo; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonUnmarshaller; - -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBException; -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; - -/** - * We have defined a dedicated Reader for LabelsToNodesInfo, - * aimed at adapting to the Jersey2 framework - * to ensure that JSON can be converted into LabelsToNodesInfo. - */ -@Provider -@Consumes(MediaType.APPLICATION_JSON) -public class LabelsToNodesInfoReader implements MessageBodyReader { - - private JettisonUnmarshaller jsonUnmarshaller; - - public LabelsToNodesInfoReader() { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(LabelsToNodesInfo.class); - jsonUnmarshaller = jettisonJaxbContext.createJsonUnmarshaller(); - } catch (JAXBException e) { - } - } - - @Override - public boolean isReadable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - return type == LabelsToNodesInfo.class; - } - - @Override - public LabelsToNodesInfo readFrom(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, InputStream entityStream) - throws IOException, WebApplicationException { - try { - LabelsToNodesInfo labelsToNodesInfo = - jsonUnmarshaller.unmarshalFromJSON(entityStream, LabelsToNodesInfo.class); - return labelsToNodesInfo; - } catch (JAXBException e) { - throw new IOException(e); - } - } -} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/NodeLabelsInfoReader.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/NodeLabelsInfoReader.java deleted file mode 100644 index 71afb95280b45..0000000000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/NodeLabelsInfoReader.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.yarn.server.resourcemanager.webapp.reader; - -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonUnmarshaller; - -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBException; -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; - -/** - * We have defined a dedicated Reader for NodeLabelsInfo, - * aimed at adapting to the Jersey2 framework - * to ensure that JSON can be converted into NodeLabelsInfo. - */ -@Provider -@Consumes(MediaType.APPLICATION_JSON) -public class NodeLabelsInfoReader implements MessageBodyReader { - - private JettisonUnmarshaller jsonUnmarshaller; - - public NodeLabelsInfoReader() { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(NodeLabelsInfo.class); - jsonUnmarshaller = jettisonJaxbContext.createJsonUnmarshaller(); - } catch (JAXBException e) { - } - } - - @Override - public boolean isReadable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - return type == NodeLabelsInfo.class; - } - - @Override - public NodeLabelsInfo readFrom(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, InputStream entityStream) - throws IOException, WebApplicationException { - try { - NodeLabelsInfo nodeLabelsInfo = - jsonUnmarshaller.unmarshalFromJSON(entityStream, NodeLabelsInfo.class); - return nodeLabelsInfo; - } catch (JAXBException e) { - throw new IOException(e); - } - } -} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/NodeToLabelsInfoReader.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/NodeToLabelsInfoReader.java deleted file mode 100644 index d78460f81eeb4..0000000000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/NodeToLabelsInfoReader.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.yarn.server.resourcemanager.webapp.reader; - -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonUnmarshaller; - -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBException; -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; - -/** - * We have defined a dedicated Reader for NodeToLabelsInfo, - * aimed at adapting to the Jersey2 framework - * to ensure that JSON can be converted into NodeToLabelsInfo. - */ -@Provider -@Consumes(MediaType.APPLICATION_JSON) -public class NodeToLabelsInfoReader implements MessageBodyReader { - - private JettisonUnmarshaller jsonUnmarshaller; - - public NodeToLabelsInfoReader() { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(NodeToLabelsInfo.class); - jsonUnmarshaller = jettisonJaxbContext.createJsonUnmarshaller(); - } catch (JAXBException e) { - } - } - - @Override - public boolean isReadable(Class type, - Type genericType, Annotation[] annotations, MediaType mediaType) { - return type == NodeToLabelsInfo.class; - } - - @Override - public NodeToLabelsInfo readFrom(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, - InputStream entityStream) throws IOException, WebApplicationException { - try { - NodeToLabelsInfo nodeLabelsInfo = - jsonUnmarshaller.unmarshalFromJSON(entityStream, NodeToLabelsInfo.class); - return nodeLabelsInfo; - } catch (JAXBException e) { - throw new IOException(e); - } - } -} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/ResourceOptionInfoReader.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/ResourceOptionInfoReader.java deleted file mode 100644 index 352e266fbf2de..0000000000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/reader/ResourceOptionInfoReader.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.yarn.server.resourcemanager.webapp.reader; - -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonUnmarshaller; - -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBException; -import java.io.IOException; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; - -/** - * We have defined a dedicated Reader for ResourceOptionInfo, - * aimed at adapting to the Jersey2 framework - * to ensure that JSON can be converted into ResourceOptionInfo. - */ -@Provider -@Consumes(MediaType.APPLICATION_JSON) -public class ResourceOptionInfoReader implements MessageBodyReader { - - private JettisonUnmarshaller jsonUnmarshaller; - - public ResourceOptionInfoReader() { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(ResourceOptionInfo.class); - jsonUnmarshaller = jettisonJaxbContext.createJsonUnmarshaller(); - } catch (JAXBException e) { - } - } - - @Override - public boolean isReadable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - return type == ResourceOptionInfo.class; - } - - @Override - public ResourceOptionInfo readFrom(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, InputStream entityStream) - throws IOException, WebApplicationException { - try { - ResourceOptionInfo resourceOptionInfo = - jsonUnmarshaller.unmarshalFromJSON(entityStream, ResourceOptionInfo.class); - return resourceOptionInfo; - } catch (JAXBException e) { - throw new IOException(e); - } - } -} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/ApplicationSubmissionContextInfoWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/ApplicationSubmissionContextInfoWriter.java deleted file mode 100644 index ace28592b286c..0000000000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/ApplicationSubmissionContextInfoWriter.java +++ /dev/null @@ -1,89 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.yarn.server.resourcemanager.webapp.writer; - -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ApplicationSubmissionContextInfo; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonMarshaller; - -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import java.io.IOException; -import java.io.OutputStream; -import java.io.StringWriter; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; - -/** - * We have defined a dedicated Writer for ApplicationSubmissionContextInfo, - * aimed at adapting to the Jersey2 framework to ensure - * that ApplicationSubmissionContextInfo can be converted into JSON format. - */ -@Provider -@Consumes(MediaType.APPLICATION_JSON) -public class ApplicationSubmissionContextInfoWriter - implements MessageBodyWriter { - - private JettisonMarshaller jettisonMarshaller; - private Marshaller marshaller; - - public ApplicationSubmissionContextInfoWriter() { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext( - ApplicationSubmissionContextInfo.class); - jettisonMarshaller = jettisonJaxbContext.createJsonMarshaller(); - marshaller = jettisonJaxbContext.createMarshaller(); - } catch (JAXBException e) { - } - } - - @Override - public boolean isWriteable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - return type == ApplicationSubmissionContextInfo.class; - } - - @Override - public void writeTo(ApplicationSubmissionContextInfo applicationSubmissionContextInfo, - Class type, Type genericType, Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, OutputStream entityStream) - throws IOException, WebApplicationException { - StringWriter stringWriter = new StringWriter(); - try { - if (mediaType.toString().equals(MediaType.APPLICATION_JSON)) { - jettisonMarshaller.marshallToJSON(applicationSubmissionContextInfo, stringWriter); - entityStream.write(stringWriter.toString().getBytes(StandardCharsets.UTF_8)); - } - - if (mediaType.toString().equals(MediaType.APPLICATION_XML)) { - marshaller.marshal(applicationSubmissionContextInfo, stringWriter); - entityStream.write(stringWriter.toString().getBytes(StandardCharsets.UTF_8)); - } - - } catch (JAXBException e) { - throw new IOException(e); - } - } -} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/ResourceOptionInfoWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/ResourceOptionInfoWriter.java deleted file mode 100644 index 4cfe6a5777e69..0000000000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/ResourceOptionInfoWriter.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.yarn.server.resourcemanager.webapp.writer; - -import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonMarshaller; - -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import java.io.IOException; -import java.io.OutputStream; -import java.io.StringWriter; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; - -/** - * We have defined a dedicated Writer for ResourceOptionInfo, - * aimed at adapting to the Jersey2 framework to ensure - * that ResourceOptionInfo can be converted into JSON format. - */ -@Provider -@Consumes(MediaType.APPLICATION_JSON) -public class ResourceOptionInfoWriter implements MessageBodyWriter { - - private JettisonMarshaller jettisonMarshaller; - private Marshaller marshaller; - - public ResourceOptionInfoWriter() { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext( - ResourceOptionInfo.class); - jettisonMarshaller = jettisonJaxbContext.createJsonMarshaller(); - marshaller = jettisonJaxbContext.createMarshaller(); - } catch (JAXBException e) { - } - } - - @Override - public boolean isWriteable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - return type == ResourceOptionInfo.class; - } - - @Override - public void writeTo(ResourceOptionInfo resourceOptionInfo, Class type, - Type genericType, Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, - OutputStream entityStream) throws IOException, WebApplicationException { - StringWriter stringWriter = new StringWriter(); - try { - if (mediaType.toString().equals(MediaType.APPLICATION_JSON)) { - jettisonMarshaller.marshallToJSON(resourceOptionInfo, stringWriter); - entityStream.write(stringWriter.toString().getBytes(StandardCharsets.UTF_8)); - } - - if (mediaType.toString().equals(MediaType.APPLICATION_XML)) { - marshaller.marshal(resourceOptionInfo, stringWriter); - entityStream.write(stringWriter.toString().getBytes(StandardCharsets.UTF_8)); - } - } catch (JAXBException e) { - throw new IOException(e); - } - } -} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/SchedConfUpdateInfoWriter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/SchedConfUpdateInfoWriter.java deleted file mode 100644 index 4863c37a34acc..0000000000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/writer/SchedConfUpdateInfoWriter.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.yarn.server.resourcemanager.webapp.writer; - -import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonMarshaller; - -import javax.ws.rs.Consumes; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import java.io.IOException; -import java.io.OutputStream; -import java.io.StringWriter; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; - -/** - * We have defined a dedicated Writer for SchedConfUpdateInfo, - * aimed at adapting to the Jersey2 framework to ensure - * that SchedConfUpdateInfo can be converted into JSON format. - */ -@Provider -@Consumes(MediaType.APPLICATION_JSON) -public class SchedConfUpdateInfoWriter implements MessageBodyWriter { - - private JettisonMarshaller jettisonMarshaller; - private Marshaller marshaller; - - public SchedConfUpdateInfoWriter(){ - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext( - SchedConfUpdateInfo.class); - jettisonMarshaller = jettisonJaxbContext.createJsonMarshaller(); - marshaller = jettisonJaxbContext.createMarshaller(); - } catch (JAXBException e) { - } - } - - @Override - public boolean isWriteable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - return type == SchedConfUpdateInfo.class; - } - - @Override - public void writeTo(SchedConfUpdateInfo schedConfUpdateInfo, Class type, - Type genericType, Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, OutputStream entityStream) - throws IOException, WebApplicationException { - StringWriter stringWriter = new StringWriter(); - try { - if (mediaType.toString().equals(MediaType.APPLICATION_JSON)) { - jettisonMarshaller.marshallToJSON(schedConfUpdateInfo, stringWriter); - entityStream.write(stringWriter.toString().getBytes(StandardCharsets.UTF_8)); - } - - if (mediaType.toString().equals(MediaType.APPLICATION_XML)) { - marshaller.marshal(schedConfUpdateInfo, stringWriter); - entityStream.write(stringWriter.toString().getBytes(StandardCharsets.UTF_8)); - } - } catch (JAXBException e) { - throw new IOException(e); - } - } -} From dee0eb16db950ca5b5366e8fc29893054044ed9e Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Thu, 16 Oct 2025 14:43:35 +0200 Subject: [PATCH 05/19] fromJson method --- .../TestFederationRMStateStoreService.java | 10 ++-------- .../webapp/TestWebServiceUtil.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java index 92c337b0773cd..01d8ada4247e7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java @@ -17,6 +17,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.federation; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.fromJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -103,15 +104,11 @@ public class TestFederationRMStateStoreService { private Configuration conf; private FederationStateStore stateStore; private long lastHearbeatTS = 0; - private JettisonJaxbContext jettisonJaxbContext; - private JettisonUnmarshaller jsonUnmarshaller; private MockRM mockRM; @BeforeEach public void setUp() throws IOException, YarnException, JAXBException { conf = new YarnConfiguration(); - this.jettisonJaxbContext = new JettisonJaxbContext(ClusterMetricsInfo.class); - this.jsonUnmarshaller = jettisonJaxbContext.createJsonUnmarshaller(); conf.setBoolean(YarnConfiguration.FEDERATION_ENABLED, true); conf.setInt(YarnConfiguration.FEDERATION_STATESTORE_HEARTBEAT_INITIAL_DELAY, 10); conf.set(YarnConfiguration.RM_CLUSTER_ID, subClusterId.getId()); @@ -124,8 +121,6 @@ public void setUp() throws IOException, YarnException, JAXBException { @AfterEach public void tearDown() throws Exception { - jettisonJaxbContext = null; - jsonUnmarshaller = null; mockRM.stop(); mockRM = null; } @@ -201,8 +196,7 @@ private void explicitFailover(MockRM rm) throws IOException { private void checkClusterMetricsInfo(String capability, int numNodes) throws JAXBException { - ClusterMetricsInfo clusterMetricsInfo = jsonUnmarshaller.unmarshalFromJSON( - new StringReader(capability), ClusterMetricsInfo.class); + ClusterMetricsInfo clusterMetricsInfo = fromJson(capability, ClusterMetricsInfo.class); assertEquals(numNodes, clusterMetricsInfo.getTotalNodes()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java index 3f358d8f7d18a..2ef9c416ddf7b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java @@ -39,6 +39,7 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.OutputKeys; @@ -47,6 +48,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -385,4 +387,18 @@ public static String toXml(Object obj, Class klass) throws Exception { marshaller.marshal(obj, stringWriter); return stringWriter.toString(); } + + public static T fromJson(String json, Class klass) { + try { + JAXBContext jc = new JAXBContextResolver().getContext(klass); + if (jc == null) { + jc = JAXBContext.newInstance(klass); + } + Unmarshaller unmarshaller = jc.createUnmarshaller(); + unmarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_JSON); + return unmarshaller.unmarshal(new StreamSource(new StringReader(json)),klass).getValue(); + } catch (Exception e) { + throw new RuntimeException("Failed to read from json: " + json, e); + } + } } From e0156b8e0013da0fe43060d953c07afb123f5345 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Thu, 16 Oct 2025 16:07:00 +0200 Subject: [PATCH 06/19] remove Jettison from federation --- .../FederationStateStoreHeartbeat.java | 29 ++++++++++++------- .../FederationStateStoreService.java | 6 +++- .../TestFederationRMStateStoreService.java | 5 ++-- ...stRMWebServicesAppCustomResourceTypes.java | 1 - .../webapp/TestWebServiceUtil.java | 3 -- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationStateStoreHeartbeat.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationStateStoreHeartbeat.java index d43b2091c70dd..ffd3889d315f6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationStateStoreHeartbeat.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationStateStoreHeartbeat.java @@ -20,19 +20,23 @@ import java.io.StringWriter; +import javax.ws.rs.core.MediaType; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Marshaller; + import org.apache.hadoop.yarn.server.federation.store.FederationStateStore; import org.apache.hadoop.yarn.server.federation.store.records.SubClusterHeartbeatRequest; import org.apache.hadoop.yarn.server.federation.store.records.SubClusterId; import org.apache.hadoop.yarn.server.federation.store.records.SubClusterState; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.JAXBContextResolver; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ClusterMetricsInfo; + +import org.eclipse.persistence.jaxb.MarshallerProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonMarshaller; - /** * Periodic heart beat from a ResourceManager participating in * federation to indicate liveliness. The heart beat publishes the current @@ -48,12 +52,18 @@ public class FederationStateStoreHeartbeat implements Runnable { private final FederationStateStore stateStoreService; private final ResourceScheduler rs; private String capability; + private JAXBContextResolver resolver; - public FederationStateStoreHeartbeat(SubClusterId subClusterId, - FederationStateStore stateStoreClient, ResourceScheduler scheduler) { + public FederationStateStoreHeartbeat( + SubClusterId subClusterId, + FederationStateStore stateStoreClient, + ResourceScheduler scheduler, + JAXBContextResolver resolver + ) { this.stateStoreService = stateStoreClient; this.subClusterId = subClusterId; this.rs = scheduler; + this.resolver = resolver; LOG.info("Initialized Federation membership for cluster with timestamp: {}. ", ResourceManager.getClusterTimeStamp()); } @@ -66,12 +76,11 @@ private void updateClusterState() { try { // get the current state ClusterMetricsInfo clusterMetricsInfo = new ClusterMetricsInfo(rs); - - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(ClusterMetricsInfo.class); - JettisonMarshaller jsonMarshaller = jettisonJaxbContext.createJsonMarshaller(); + JAXBContext context = resolver.getContext(ClusterMetricsInfo.class); + Marshaller marshaller = context.createMarshaller(); + marshaller.setProperty(MarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_JSON); StringWriter stringWriter = new StringWriter(); - jsonMarshaller.marshallToJSON(clusterMetricsInfo, stringWriter); - + marshaller.marshal(clusterMetricsInfo, stringWriter); capability = stringWriter.toString(); } catch (Exception e) { LOG.warn("Exception while trying to generate cluster state," diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationStateStoreService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationStateStoreService.java index 6384736d62e11..0c50618adb399 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationStateStoreService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/federation/FederationStateStoreService.java @@ -89,6 +89,7 @@ import org.apache.hadoop.yarn.server.records.Version; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.JAXBContextResolver; import org.apache.hadoop.yarn.util.Clock; import org.apache.hadoop.yarn.util.MonotonicClock; import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp; @@ -121,6 +122,7 @@ public class FederationStateStoreService extends AbstractService private String cleanUpThreadNamePrefix = "FederationStateStoreService-Clean-Thread"; private int cleanUpRetryCountNum; private long cleanUpRetrySleepTime; + private JAXBContextResolver resolver; public FederationStateStoreService(RMContext rmContext) { super(FederationStateStoreService.class.getName()); @@ -182,6 +184,8 @@ protected void serviceInit(Configuration conf) throws Exception { this.metrics = FederationStateStoreServiceMetrics.getMetrics(); LOG.info("Initialized federation statestore service metrics."); + this.resolver = new JAXBContextResolver(conf); + super.serviceInit(conf); } @@ -252,7 +256,7 @@ private void registerAndInitializeHeartbeat() { "Failed to register Federation membership with the StateStore", e); } stateStoreHeartbeat = new FederationStateStoreHeartbeat(subClusterId, - stateStoreClient, rmContext.getScheduler()); + stateStoreClient, rmContext.getScheduler(), resolver); scheduledExecutorService = HadoopExecutors.newSingleThreadScheduledExecutor(); scheduledExecutorService.scheduleWithFixedDelay(stateStoreHeartbeat, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java index 01d8ada4247e7..2a0ffa01b4fe6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java @@ -194,9 +194,10 @@ private void explicitFailover(MockRM rm) throws IOException { stateStore = rm.getFederationStateStoreService().getStateStoreClient(); } - private void checkClusterMetricsInfo(String capability, int numNodes) - throws JAXBException { + private void checkClusterMetricsInfo(String capability, int numNodes) { ClusterMetricsInfo clusterMetricsInfo = fromJson(capability, ClusterMetricsInfo.class); + System.err.println(capability); + System.err.println(clusterMetricsInfo.getTotalNodes()); assertEquals(numNodes, clusterMetricsInfo.getTotalNodes()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppCustomResourceTypes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppCustomResourceTypes.java index 23ad29795bd49..70566a5ee7815 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppCustomResourceTypes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppCustomResourceTypes.java @@ -17,7 +17,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import org.apache.hadoop.conf.Configuration; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java index 2ef9c416ddf7b..efbf629e930e0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java @@ -37,7 +37,6 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.parsers.DocumentBuilder; @@ -59,8 +58,6 @@ import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.eclipse.persistence.jaxb.MarshallerProperties; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonMarshaller; import org.w3c.dom.Document; import org.xml.sax.InputSource; From 9a7fedfd455cf703e376bb2f9a42aea977de61dd Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Thu, 16 Oct 2025 16:47:02 +0200 Subject: [PATCH 07/19] remove global app jettison provider --- .../java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java index a6ba24b6a712c..f455fc57f31dc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java @@ -40,6 +40,7 @@ public void setUp() throws Exception { } public final WebTarget targetWithJsonObject() { - return target().register(new JettisonObjectProvider.App()); +// return target().register(new JettisonObjectProvider.App()); + return target(); } } From 7c21a9f00b0df6fc1d099643cdbeeab6bf31a3d2 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Thu, 16 Oct 2025 17:09:02 +0200 Subject: [PATCH 08/19] remove jettison marshallers --- .../webapp/TestRMWebServiceAppsNodelabel.java | 1 - .../webapp/TestRMWebServices.java | 1 - .../webapp/TestRMWebServicesAppAttempts.java | 1 - .../webapp/TestRMWebServicesApps.java | 1 - ...tRMWebServicesAppsCustomResourceTypes.java | 1 - .../TestRMWebServicesAppsModification.java | 42 +++------------ ...ySchedLegacyQueueCreationAbsoluteMode.java | 1 - ...WebServicesCapacitySchedulerMixedMode.java | 1 - ...hedulerMixedModeAbsoluteAndPercentage.java | 1 - ...xedModeAbsoluteAndPercentageAndWeight.java | 1 - ...eAbsoluteAndPercentageAndWeightVector.java | 1 - ...rMixedModeAbsoluteAndPercentageVector.java | 1 - ...tySchedulerMixedModeAbsoluteAndWeight.java | 1 - ...dulerMixedModeAbsoluteAndWeightVector.java | 1 - ...SchedulerMixedModePercentageAndWeight.java | 1 - ...lerMixedModePercentageAndWeightVector.java | 1 - .../TestRMWebServicesForCSWithPartitions.java | 1 - .../webapp/TestRMWebServicesReservation.java | 53 ++++--------------- .../TestRMWebServicesSchedulerActivities.java | 1 - ...edulerActivitiesWithMultiNodesEnabled.java | 1 - .../TestRMWebServicesFairScheduler.java | 1 - ...vicesFairSchedulerCustomResourceTypes.java | 1 - 22 files changed, 17 insertions(+), 98 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java index 6fc73ea019f73..c0dd04ff93d30 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java @@ -62,7 +62,6 @@ import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java index e4b4e7b7ba533..eee6a416d2c7d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java @@ -123,7 +123,6 @@ import org.xml.sax.InputSource; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java index 04f23952bee82..74467beda7d5f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java @@ -17,7 +17,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import org.apache.hadoop.conf.Configuration; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 6e95e668cac6f..4de46e9b058b3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -19,7 +19,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import org.apache.hadoop.conf.Configuration; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsCustomResourceTypes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsCustomResourceTypes.java index ccdcd29bc01a0..b92d9fa2ddbfa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsCustomResourceTypes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsCustomResourceTypes.java @@ -19,7 +19,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import org.apache.hadoop.conf.Configuration; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index 1063f364eee43..fc14fb4f10795 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -30,7 +31,6 @@ import java.io.File; import java.io.IOException; import java.io.StringReader; -import java.io.StringWriter; import java.net.URI; import java.nio.charset.StandardCharsets; import java.security.Principal; @@ -111,7 +111,6 @@ import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; -import com.google.gson.Gson; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; @@ -126,9 +125,6 @@ import org.xml.sax.SAXException; import com.google.inject.Singleton; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonMarshaller; -import org.glassfish.jersey.jettison.internal.entity.JettisonObjectProvider.App; import org.glassfish.jersey.internal.inject.AbstractBinder; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; @@ -337,7 +333,7 @@ private WebTarget constructWebResource(WebTarget r, String... paths) { } private WebTarget constructWebResource(String... paths) { - WebTarget r = target().register(App.class); + WebTarget r = target(); WebTarget ws = r.path("ws").path("v1").path("cluster"); return this.constructWebResource(ws, paths); } @@ -399,7 +395,7 @@ public void testSingleAppKill(int run) throws Exception { Object entity; if (contentType.equals(MediaType.APPLICATION_JSON_TYPE)) { - entity = appStateToJSON(targetState); + entity = toJson(targetState, AppState.class); } else { entity = targetState; } @@ -495,7 +491,7 @@ public void testSingleAppKillInvalidState(int run) throws Exception { AppState targetState = new AppState(targetStateString); Object entity; if (contentType.equals(MediaType.APPLICATION_JSON_TYPE)) { - entity = appStateToJSON(targetState); + entity = toJson(targetState, AppState.class); } else { entity = targetState; } @@ -519,10 +515,6 @@ public void testSingleAppKillInvalidState(int run) throws Exception { rm.stop(); } - private static String appStateToJSON(AppState state) throws Exception { - return new Gson().toJson(state); - } - protected static void verifyAppStateJson(Response response, RMAppState... states) throws JSONException { @@ -726,7 +718,7 @@ protected String validateGetNewApplicationResponse(Response resp) SAXException { String ret = ""; if (resp.getMediaType().toString().contains(MediaType.APPLICATION_JSON)) { - JSONObject json = resp.readEntity(JSONObject.class); + JSONObject json = responseToJson(resp); ret = validateGetNewApplicationJsonResponse(json); } else if (resp.getMediaType().toString().contains(MediaType.APPLICATION_XML)) { String xml = resp.readEntity(String.class); @@ -1151,7 +1143,7 @@ public void testUpdateAppPriority(int run) throws Exception { AppPriority priority = new AppPriority(modifiedPriority); Object entity; if (contentType.equals(MediaType.APPLICATION_JSON_TYPE)) { - entity = appPriorityToJSON(priority); + entity = toJson(priority, AppPriority.class); } else { entity = priority; } @@ -1240,7 +1232,7 @@ public void testAppMove(int run) throws Exception { AppQueue targetQueue = new AppQueue("test"); Object entity; if (contentType.equals(MediaType.APPLICATION_JSON_TYPE)) { - entity = appQueueToJSON(targetQueue); + entity = toJson(targetQueue, AppQueue.class); } else { entity = targetQueue; } @@ -1287,15 +1279,6 @@ public void testAppMove(int run) throws Exception { rm.stop(); } - protected static String appPriorityToJSON(AppPriority targetPriority) - throws Exception { - return new Gson().toJson(targetPriority); - } - - protected static String appQueueToJSON(AppQueue targetQueue) throws Exception { - return new Gson().toJson(targetQueue); - } - protected static void verifyAppPriorityJson(Response response, int expectedPriority) throws JSONException { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, @@ -1445,7 +1428,7 @@ private Object getAppTimeoutInfoEntity(ApplicationTimeoutType type, Object entity; if (contentType.equals(MediaType.APPLICATION_JSON_TYPE)) { - entity = appTimeoutToJSON(timeoutUpdate); + entity = toJson(timeoutUpdate, AppTimeoutInfo.class); } else { entity = timeoutUpdate; } @@ -1493,13 +1476,4 @@ protected static void verifyAppTimeoutXML(Response response, assertTrue(WebServicesTestUtils.getXmlLong(element, "remainingTimeInSeconds") < timeOutFromNow); } - - protected static String appTimeoutToJSON(AppTimeoutInfo timeout) - throws Exception { - StringWriter stringWriter = new StringWriter(); - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext(AppTimeoutInfo.class); - JettisonMarshaller jettisonMarshaller = jettisonJaxbContext.createJsonMarshaller(); - jettisonMarshaller.marshallToJSON(timeout, stringWriter); - return stringWriter.toString(); - } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreationAbsoluteMode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreationAbsoluteMode.java index 87b4171fc5ec4..553438046df39 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreationAbsoluteMode.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedLegacyQueueCreationAbsoluteMode.java @@ -29,7 +29,6 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import org.junit.jupiter.api.AfterAll; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedMode.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedMode.java index 4034d3ded9610..19f564b70e8a8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedMode.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedMode.java @@ -28,7 +28,6 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentage.java index dea9d31ee7779..88bb76c02f47d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentage.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentage.java @@ -24,7 +24,6 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeight.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeight.java index 2d4325fd4344c..08c4176aac5de 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeight.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeight.java @@ -24,7 +24,6 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeightVector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeightVector.java index 22ab95418f33c..4875c65dbd67b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeightVector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageAndWeightVector.java @@ -24,7 +24,6 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageVector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageVector.java index 89aee88f92d4c..643d83321a04b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageVector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndPercentageVector.java @@ -24,7 +24,6 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeight.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeight.java index aba0732574c79..c977f457e39b8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeight.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeight.java @@ -24,7 +24,6 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeightVector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeightVector.java index 968c48ed3abcc..801e70b2fa9d8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeightVector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModeAbsoluteAndWeightVector.java @@ -24,7 +24,6 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeight.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeight.java index 6c202dbea6c7d..74485dbc5f4ff 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeight.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeight.java @@ -24,7 +24,6 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeightVector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeightVector.java index 96a419a339130..3cecbdeede4bd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeightVector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerMixedModePercentageAndWeightVector.java @@ -24,7 +24,6 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java index ee691bc61f248..0fa91a1dec4fa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java @@ -90,7 +90,6 @@ import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableSet; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index ad1f8737ec7f3..278e93e08f8f4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -18,6 +18,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.fromJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.assertj.core.api.Assertions.assertThat; @@ -84,8 +85,6 @@ import org.junit.jupiter.api.AfterEach; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonUnmarshaller; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import org.junit.jupiter.params.ParameterizedTest; @@ -113,17 +112,6 @@ public class TestRMWebServicesReservation extends JerseyTestBase { private static final String GET_NEW_RESERVATION_PATH = "reservation/new-reservation"; - private static JettisonUnmarshaller reservationSubmissionRequestInfoReader; - static { - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext( - ReservationSubmissionRequestInfo.class); - reservationSubmissionRequestInfoReader = jettisonJaxbContext.createJsonUnmarshaller(); - } catch (JAXBException e) { - throw new RuntimeException(e); - } - } - private ResourceConfig config; private HttpServletRequest hsRequest = mock(HttpServletRequest.class); private HttpServletResponse hsResponse = mock(HttpServletResponse.class); @@ -1051,10 +1039,7 @@ private ReservationId getReservationIdTestHelper(int fallbackReservationId) assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = - response. - readEntity(JSONObject.class). - getJSONObject("new-reservation"); + JSONObject json = responseToJson(response).getJSONObject("new-reservation"); assertEquals(1, json.length(), "incorrect number of elements"); ReservationId rid = null; @@ -1094,9 +1079,9 @@ private Response reservationSubmissionTestHelper(String path, private Response submitAndVerifyReservation(String path, String media, String reservationJson) throws Exception { - ReservationSubmissionRequestInfo rsci = reservationSubmissionRequestInfoReader. - unmarshalFromJSON(new StringReader(reservationJson), - ReservationSubmissionRequestInfo.class); + ReservationSubmissionRequestInfo rsci = + fromJson(reservationJson, ReservationSubmissionRequestInfo.class); + Thread.sleep(1000); Response response = constructWebResource(path) .request(MediaType.APPLICATION_JSON) @@ -1116,18 +1101,8 @@ private void updateReservationTestHelper(String path, String reservationJson = loadJsonFile("update-reservation.json"); - JettisonUnmarshaller reservationUpdateRequestInfoReader; - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext( - ReservationUpdateRequestInfo.class); - reservationUpdateRequestInfoReader = jettisonJaxbContext.createJsonUnmarshaller(); - } catch (JAXBException e) { - throw new RuntimeException(e); - } - - ReservationUpdateRequestInfo rsci = reservationUpdateRequestInfoReader. - unmarshalFromJSON(new StringReader(reservationJson), - ReservationUpdateRequestInfo.class); + ReservationUpdateRequestInfo rsci = + fromJson(reservationJson, ReservationUpdateRequestInfo.class); if (this.isAuthenticationEnabled()) { // only works when previous submit worked @@ -1174,18 +1149,8 @@ private void testDeleteReservationHelper(String path, String reservationJson = loadJsonFile("delete-reservation.json"); - JettisonUnmarshaller reader; - try { - JettisonJaxbContext jettisonJaxbContext = new JettisonJaxbContext( - ReservationDeleteRequestInfo.class); - reader = jettisonJaxbContext.createJsonUnmarshaller(); - } catch (JAXBException e) { - throw new RuntimeException(e); - } - - ReservationDeleteRequestInfo rsci = reader. - unmarshalFromJSON(new StringReader(reservationJson), - ReservationDeleteRequestInfo.class); + ReservationDeleteRequestInfo rsci = + fromJson(reservationJson, ReservationDeleteRequestInfo.class); if (this.isAuthenticationEnabled()) { // only works when previous submit worked diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java index fc0a764fddeb3..a807cdf22ddb5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java @@ -19,7 +19,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java index 6bd84cfe88cf7..e112f53eca936 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java @@ -18,7 +18,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import org.apache.hadoop.conf.Configuration; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java index eb8c2faaacfd0..f5ca6e92d21dd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java @@ -19,7 +19,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp.fairscheduler; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import org.apache.hadoop.conf.Configuration; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairSchedulerCustomResourceTypes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairSchedulerCustomResourceTypes.java index 0d4f18ea925ba..723dc334c6481 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairSchedulerCustomResourceTypes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairSchedulerCustomResourceTypes.java @@ -19,7 +19,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp.fairscheduler; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import org.apache.hadoop.conf.Configuration; From b7260bb0287dc6873a7e7d5aacaeefc88dfb986d Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Thu, 16 Oct 2025 17:36:11 +0200 Subject: [PATCH 09/19] remove last jettison marshallers --- .../server/resourcemanager/webapp/JAXBContextResolver.java | 3 --- .../hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java | 2 -- .../apache/hadoop/yarn/server/resourcemanager/TestRMHA.java | 5 +---- .../federation/TestFederationRMStateStoreService.java | 4 ---- .../org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java | 6 ++++-- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java index 4fb58449a4a53..ecc658b86a334 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/JAXBContextResolver.java @@ -20,13 +20,10 @@ import org.eclipse.persistence.jaxb.JAXBContextFactory; import org.eclipse.persistence.jaxb.MarshallerProperties; -import org.glassfish.jersey.jettison.JettisonConfig; -import org.glassfish.jersey.jettison.JettisonJaxbContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Collections; -import java.util.List; import java.util.Map; import java.util.HashMap; import java.util.Set; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java index 8619320b1d63b..b673e6e37895e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java @@ -24,7 +24,6 @@ import org.apache.hadoop.conf.Configuration; -import org.glassfish.jersey.moxy.json.MoxyJsonConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState; @@ -39,7 +38,6 @@ import javax.servlet.Filter; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; /** diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java index d15a02c778a86..79544c4c93fe6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java @@ -76,7 +76,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; -import org.glassfish.jersey.jettison.internal.entity.JettisonObjectProvider; public class TestRMHA { private static final Logger LOG = LoggerFactory.getLogger(TestRMHA.class); @@ -162,9 +161,7 @@ private void checkActiveRMFunctionality() throws Exception { private void checkActiveRMWebServices() throws JSONException { // Validate web-service - Client webServiceClient = ClientBuilder. - newClient(). - register(new JettisonObjectProvider.App()); + Client webServiceClient = ClientBuilder.newClient(); InetSocketAddress rmWebappAddr = NetUtils.getConnectAddress(rm.getWebapp().getListenerAddress()); String webappURL = diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java index 2a0ffa01b4fe6..06a93e7cd60aa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java @@ -24,7 +24,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; -import java.io.StringReader; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; @@ -84,9 +83,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.glassfish.jersey.jettison.JettisonJaxbContext; -import org.glassfish.jersey.jettison.JettisonUnmarshaller; - import static org.mockito.Mockito.mock; /** diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java index ef17057e89ea4..a9be28c4c20f0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java @@ -31,9 +31,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler; import org.apache.hadoop.yarn.server.resourcemanager.webapp.JAXBContextResolver; import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebServices; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.util.YarnVersionInfo; import org.glassfish.jersey.internal.inject.AbstractBinder; -import org.glassfish.jersey.jettison.JettisonFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.TestProperties; import org.junit.jupiter.api.BeforeEach; @@ -74,7 +74,8 @@ protected Application configure() { config.register(new JerseyBinder()); config.register(RMWebServices.class); config.register(GenericExceptionHandler.class); - config.register(new JettisonFeature()).register(JAXBContextResolver.class); + config.register(JsonProviderFeature.class); + config.register(JAXBContextResolver.class); forceSet(TestProperties.CONTAINER_PORT, JERSEY_RANDOM_PORT); return config; } @@ -167,6 +168,7 @@ public void testAllowNonBrowserInteractionWithoutHeader() throws Exception { assertEquals(MediaType.APPLICATION_XML_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); String xml = response.readEntity(String.class); + System.err.println(xml); verifyClusterInfoXML(xml); } From ba4ab13eb2a710900933646670a184f122b14d06 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Thu, 16 Oct 2025 17:42:30 +0200 Subject: [PATCH 10/19] fix pom.xml --- .../hadoop-yarn-server-resourcemanager/pom.xml | 4 ---- .../apache/hadoop/yarn/server/resourcemanager/TestRMHA.java | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index 5bd1a9221d4fd..5f70fbd9bd2e2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -261,10 +261,6 @@ jersey-media-jaxb test - - org.glassfish.jersey.media - jersey-media-json-jettison - org.glassfish.jersey.media jersey-media-moxy diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java index 79544c4c93fe6..cb2ee2dbfb308 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java @@ -175,7 +175,8 @@ private void checkActiveRMWebServices() throws JSONException { .get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = response.readEntity(JSONObject.class); + String raw = response.readEntity(String.class); + JSONObject json = new JSONObject(raw); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject appJson = json.getJSONObject("app"); From d8e744569f5315f180fc5c74941b050b1c81302c Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Fri, 17 Oct 2025 11:36:26 +0200 Subject: [PATCH 11/19] add javadoc, fix style --- .../hadoop/yarn/webapp/JerseyTestBase.java | 1 - .../webapp/dao/NodeLabelsInfo.java | 28 ++-- .../ClassSerialisationConfig.java | 135 ++++++++-------- .../jsonprovider/ExcludeRootJSONProvider.java | 144 ++++++++++++------ .../jsonprovider/IncludeRootJSONProvider.java | 140 ++++++++++++----- .../jsonprovider/JsonProviderFeature.java | 37 ++++- .../webapp/TestRMWebServicesApps.java | 2 - .../webapp/TestRMWebServicesReservation.java | 4 +- .../webapp/TestWebServiceUtil.java | 2 +- .../helper/AppInfoJsonVerifications.java | 3 - 10 files changed, 309 insertions(+), 187 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java index f455fc57f31dc..03996e39f7038 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java @@ -40,7 +40,6 @@ public void setUp() throws Exception { } public final WebTarget targetWithJsonObject() { -// return target().register(new JettisonObjectProvider.App()); return target(); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelsInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelsInfo.java index 1ba082438ed52..e2e99ee4b15bd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelsInfo.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/NodeLabelsInfo.java @@ -32,44 +32,44 @@ public class NodeLabelsInfo { @XmlElement(name = "nodeLabelInfo") - private ArrayList nodeLabelInfo = new ArrayList<>(); + private ArrayList nodeLabelsInfo = new ArrayList<>(); public NodeLabelsInfo() { // JAXB needs this } public NodeLabelsInfo(ArrayList nodeLabels) { - this.nodeLabelInfo = nodeLabels; + this.nodeLabelsInfo = nodeLabels; } public NodeLabelsInfo(List nodeLabels) { - this.nodeLabelInfo = new ArrayList<>(); + this.nodeLabelsInfo = new ArrayList<>(); for (NodeLabel label : nodeLabels) { - this.nodeLabelInfo.add(new NodeLabelInfo(label)); + this.nodeLabelsInfo.add(new NodeLabelInfo(label)); } } public NodeLabelsInfo(Set nodeLabelsName) { - this.nodeLabelInfo = new ArrayList<>(); + this.nodeLabelsInfo = new ArrayList<>(); for (String labelName : nodeLabelsName) { - this.nodeLabelInfo.add(new NodeLabelInfo(labelName)); + this.nodeLabelsInfo.add(new NodeLabelInfo(labelName)); } } public NodeLabelsInfo(Collection nodeLabels) { - this.nodeLabelInfo = new ArrayList<>(); + this.nodeLabelsInfo = new ArrayList<>(); nodeLabels.stream().forEach(nodeLabel -> { - this.nodeLabelInfo.add(new NodeLabelInfo(nodeLabel)); + this.nodeLabelsInfo.add(new NodeLabelInfo(nodeLabel)); }); } public ArrayList getNodeLabelsInfo() { - return nodeLabelInfo; + return nodeLabelsInfo; } public Set getNodeLabels() { Set nodeLabels = new HashSet<>(); - for (NodeLabelInfo label : nodeLabelInfo) { + for (NodeLabelInfo label : nodeLabelsInfo) { nodeLabels.add(NodeLabel.newInstance(label.getName(), label.getExclusivity())); } @@ -78,17 +78,13 @@ public Set getNodeLabels() { public List getNodeLabelsName() { ArrayList nodeLabelsName = new ArrayList<>(); - for (NodeLabelInfo label : nodeLabelInfo) { + for (NodeLabelInfo label : nodeLabelsInfo) { nodeLabelsName.add(label.getName()); } return nodeLabelsName; } public void setNodeLabelsInfo(ArrayList nodeLabelInfo) { - this.nodeLabelInfo = nodeLabelInfo; - } - - public void setNodeLabelInfo(ArrayList nodeLabelsInfo) { - this.nodeLabelInfo = nodeLabelsInfo; + this.nodeLabelsInfo = nodeLabelInfo; } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java index 28f9c290ae406..d70ae2e2578b9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -87,12 +87,15 @@ import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo; /** - * Configuration holder for class serialization setup used by the ResourceManager web services layer. + * Configuration holder for class serialization setup + * used by the ResourceManager web services layer. * *

This class manages two categories of data transfer objects (DTOs):

*
    - *
  • Wrapped classes – classes whose JSON representation includes a root wrapper element.
    • - *
  • Unwrapped classes – classes whose JSON representation omits a root wrapper element.
    • + *
  • Wrapped classes + * – classes whose JSON representation includes a root wrapper element.
    • + *
  • Unwrapped classes + * – classes whose JSON representation omits a root wrapper element.
    • *
* *

The configuration is initialized with a default list of constant classes and may optionally @@ -139,87 +142,60 @@ public class ClassSerialisationConfig { private static final Logger LOG = LoggerFactory.getLogger(ClassSerialisationConfig.class); - private static final Set> CONST_WRAPPED_CLASSES = Sets.newHashSet( - ActivitiesInfo.class, - AppActivitiesInfo.class, - AppAttemptInfo.class, - AppAttemptsInfo.class, - AppInfo.class, - ApplicationStatisticsInfo.class, - AppsInfo.class, - AppTimeoutInfo.class, - AppTimeoutsInfo.class, - BulkActivitiesInfo.class, - CapacitySchedulerHealthInfo.class, - CapacitySchedulerInfo.class, - CapacitySchedulerQueueInfo.class, - CapacitySchedulerQueueInfoList.class, - ClusterInfo.class, - ClusterMetricsInfo.class, - ConfigVersionInfo.class, - FairSchedulerQueueInfoList.class, - FifoSchedulerInfo.class, - NewReservation.class, - NodeInfo.class, - NodesInfo.class, - QueueAclInfo.class, - QueueAclsInfo.class, - RemoteExceptionData.class, - ReservationDeleteRequestInfo.class, - ReservationDeleteResponseInfo.class, - ReservationSubmissionRequestInfo.class, - ReservationUpdateRequestInfo.class, - ReservationUpdateResponseInfo.class, - ResourceInfo.class, - ResourceInformationsInfo.class, - SchedulerInfo.class, - SchedulerOverviewInfo.class, - SchedulerTypeInfo.class, - StatisticsItemInfo.class, - UserInfo.class, - UserMetricsInfo.class, - UsersInfo.class - ); - - private static final Set> CONST_UNWRAPPED_CLASSES = Sets.newHashSet( - ApplicationSubmissionContextInfo.class, - AppPriority.class, - AppQueue.class, - AppState.class, - ClusterUserInfo.class, - ConfInfo.class, - ContainerLaunchContextInfo.class, - DelegationToken.class, - LabelsToNodesInfo.class, - LocalResourceInfo.class, - NewApplication.class, - NodeLabelsInfo.class, - NodeToLabelsEntryList.class, - NodeToLabelsInfo.class, - ReservationListInfo.class, - ResourceOptionInfo.class, - SchedConfUpdateInfo.class - ); + private static final Set> CONST_WRAPPED_CLASSES = + Sets.newHashSet(ActivitiesInfo.class, AppActivitiesInfo.class, AppAttemptInfo.class, + AppAttemptsInfo.class, AppInfo.class, ApplicationStatisticsInfo.class, AppsInfo.class, + AppTimeoutInfo.class, AppTimeoutsInfo.class, BulkActivitiesInfo.class, + CapacitySchedulerHealthInfo.class, CapacitySchedulerInfo.class, + CapacitySchedulerQueueInfo.class, CapacitySchedulerQueueInfoList.class, ClusterInfo.class, + ClusterMetricsInfo.class, ConfigVersionInfo.class, FairSchedulerQueueInfoList.class, + FifoSchedulerInfo.class, NewReservation.class, NodeInfo.class, NodesInfo.class, + QueueAclInfo.class, QueueAclsInfo.class, RemoteExceptionData.class, + ReservationDeleteRequestInfo.class, ReservationDeleteResponseInfo.class, + ReservationSubmissionRequestInfo.class, ReservationUpdateRequestInfo.class, + ReservationUpdateResponseInfo.class, ResourceInfo.class, ResourceInformationsInfo.class, + SchedulerInfo.class, SchedulerOverviewInfo.class, SchedulerTypeInfo.class, + StatisticsItemInfo.class, UserInfo.class, UserMetricsInfo.class, UsersInfo.class); + + private static final Set> CONST_UNWRAPPED_CLASSES = + Sets.newHashSet(ApplicationSubmissionContextInfo.class, AppPriority.class, AppQueue.class, + AppState.class, ClusterUserInfo.class, ConfInfo.class, ContainerLaunchContextInfo.class, + DelegationToken.class, LabelsToNodesInfo.class, LocalResourceInfo.class, + NewApplication.class, NodeLabelsInfo.class, NodeToLabelsEntryList.class, + NodeToLabelsInfo.class, ReservationListInfo.class, ResourceOptionInfo.class, + SchedConfUpdateInfo.class); private final Set> wrappedClasses; private final Set> unWrappedClasses; + /** + * Default constructor + */ public ClassSerialisationConfig() { this(new Configuration()); } + /** + * Constructs a new {@code ClassSerialisationConfig} instance and initializes + * the sets of wrapped and unwrapped classes used for JSON serialization. + * + * @param conf the Hadoop {@link Configuration} instance (typically injected via + * dependency injection) used to load optional custom class definitions + */ @Inject public ClassSerialisationConfig(@javax.inject.Named("conf") Configuration conf) { wrappedClasses = new HashSet<>(CONST_WRAPPED_CLASSES); try { - wrappedClasses.addAll(Arrays.asList(conf.getClasses(YarnConfiguration.YARN_HTTP_WEBAPP_CUSTOM_DAO_CLASSES))); + wrappedClasses.addAll( + Arrays.asList(conf.getClasses(YarnConfiguration.YARN_HTTP_WEBAPP_CUSTOM_DAO_CLASSES))); } catch (RuntimeException e) { LOG.warn("Failed to load YARN_HTTP_WEBAPP_CUSTOM_DAO_CLASSES", e); } unWrappedClasses = new HashSet<>(CONST_UNWRAPPED_CLASSES); try { - wrappedClasses.addAll(Arrays.asList(conf.getClasses(YarnConfiguration.YARN_HTTP_WEBAPP_CUSTOM_UNWRAPPED_DAO_CLASSES))); + wrappedClasses.addAll(Arrays.asList( + conf.getClasses(YarnConfiguration.YARN_HTTP_WEBAPP_CUSTOM_UNWRAPPED_DAO_CLASSES))); } catch (RuntimeException e) { LOG.warn("Failed to load YARN_HTTP_WEBAPP_CUSTOM_DAO_CLASSES", e); } @@ -229,19 +205,34 @@ public ClassSerialisationConfig(@javax.inject.Named("conf") Configuration conf) Set> duplicates = new HashSet<>(wrappedClasses); duplicates.retainAll(unWrappedClasses); - if (!duplicates.isEmpty()) { throw new Error(String.format("Duplicate classes found: %s", duplicates)); } } + /** + * Returns the set of classes whose JSON representation should include a root element. + *

+ * These classes are used by MOXy JSON providers to determine which data transfer + * objects (DTOs) should be wrapped with a root element when serialized. + *

+ * + * @return an unmodifiable {@link Set} of wrapped classes + */ public Set> getWrappedClasses() { return wrappedClasses; } + /** + * Returns the set of classes whose JSON representation should omit the root element. + *

+ * These classes are used by MOXy JSON providers to determine which data transfer + * objects (DTOs) should be serialized without a root element in the JSON output. + *

+ * + * @return an unmodifiable {@link Set} of unwrapped classes + */ public Set> getUnWrappedClasses() { return unWrappedClasses; } - - } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java index 7b4c79fc4f577..845654a35c54f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +30,6 @@ import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; -import com.google.gson.Gson; import org.eclipse.persistence.jaxb.MarshallerProperties; import org.eclipse.persistence.jaxb.rs.MOXyJsonProvider; import org.slf4j.Logger; @@ -38,53 +37,112 @@ import org.apache.hadoop.conf.Configuration; +/** + * A custom JSON provider that extends {@link org.eclipse.persistence.jaxb.rs.MOXyJsonProvider} + * to handle JSON marshalling and unmarshalling without including the root element + * for configured classes. + *

+ * This provider integrates with EclipseLink MOXy and the JAX-RS runtime (annotated with + * {@link javax.ws.rs.ext.Provider}), and it is configured to both produce and consume + * {@code application/json} content types. It uses a {@link ClassSerialisationConfig} + * to determine which classes should be serialized + * and deserialized without a root element in the resulting JSON. + *

+ * + *

+ * During marshalling and unmarshalling, this provider sets the MOXy-specific properties: + *

    + *
  • {@code MarshallerProperties.JSON_INCLUDE_ROOT = false}
    • + *
  • {@code MarshallerProperties.JSON_MARSHAL_EMPTY_COLLECTIONS = false}
    • + *
+ * ensuring that the JSON representation excludes the root element and does not include + * empty collections. This is useful when interoperating with APIs that expect flat + * JSON structures or when simplifying payloads for lightweight clients. + *

+ * + *

+ * This class also provides detailed trace-level logging to help developers verify + * which entity types are being handled by this provider and how JSON binding is applied. + *

+ * + * @see org.eclipse.persistence.jaxb.rs.MOXyJsonProvider + * @see org.eclipse.persistence.jaxb.MarshallerProperties + * @see ClassSerialisationConfig + * @see Configuration + */ @Provider @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) public class ExcludeRootJSONProvider extends MOXyJsonProvider { - private final static Logger LOG = LoggerFactory.getLogger(ExcludeRootJSONProvider.class); - private final ClassSerialisationConfig classSerialisationConfig; + private final static Logger LOG = LoggerFactory.getLogger(ExcludeRootJSONProvider.class); + private final ClassSerialisationConfig classSerialisationConfig; - public ExcludeRootJSONProvider() { - this(new Configuration()); - } + /** + * Default constructor + */ + public ExcludeRootJSONProvider() { + this(new Configuration()); + } - @Inject - public ExcludeRootJSONProvider(@javax.inject.Named("conf") Configuration conf) { - classSerialisationConfig = new ClassSerialisationConfig(conf); - } + /** + * Constructs a new {@code ExcludeRootJSONProvider} instance and initializes + * its {@link ClassSerialisationConfig} based on the provided application configuration. + *

+ * This constructor is designed for dependency injection. The {@code Configuration} + * object is injected (qualified with {@code @Named("conf")}) and used to + * create a {@link ClassSerialisationConfig} instance, which controls how + * classes are serialized to JSON (e.g., whether to include root elements). + *

+ * + * @param conf the application {@link Configuration} instance injected by the framework; + * used to initialize serialization settings + */ + @Inject + public ExcludeRootJSONProvider(@javax.inject.Named("conf") Configuration conf) { + classSerialisationConfig = new ClassSerialisationConfig(conf); + } - @Override - public boolean isReadable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - boolean match = classSerialisationConfig.getUnWrappedClasses().contains(type); - LOG.trace("ExcludeRootJSONProvider compatibility with {} is {}", type, match); - return match; - } + /** + * {@inheritDoc} + */ + @Override + public boolean isReadable(Class type, Type genericType, Annotation[] annotations, + MediaType mediaType) { + boolean match = classSerialisationConfig.getUnWrappedClasses().contains(type); + LOG.trace("ExcludeRootJSONProvider compatibility with {} is {}", type, match); + return match; + } - @Override - public boolean isWriteable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - return isReadable(type, genericType, annotations, mediaType); - } + /** + * {@inheritDoc} + */ + @Override + public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, + MediaType mediaType) { + return isReadable(type, genericType, annotations, mediaType); + } - @Override - protected void preReadFrom(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, - Unmarshaller unmarshaller) throws JAXBException { - LOG.trace("ExcludeRootJSONProvider preReadFrom with {}", type); - unmarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false); - } + /** + * {@inheritDoc} + */ + @Override + protected void preReadFrom(Class type, Type genericType, Annotation[] annotations, + MediaType mediaType, MultivaluedMap httpHeaders, Unmarshaller unmarshaller) + throws JAXBException { + LOG.trace("ExcludeRootJSONProvider preReadFrom with {}", type); + unmarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false); + } - @Override - protected void preWriteTo(Object object, Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, Marshaller marshaller) - throws JAXBException { - LOG.trace("ExcludeRootJSONProvider preWriteTo with {}", type); - marshaller.setProperty(MarshallerProperties.JSON_MARSHAL_EMPTY_COLLECTIONS, false); - marshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false); - } -} \ No newline at end of file + /** + * {@inheritDoc} + */ + @Override + protected void preWriteTo(Object object, Class type, Type genericType, + Annotation[] annotations, MediaType mediaType, MultivaluedMap httpHeaders, + Marshaller marshaller) throws JAXBException { + LOG.trace("ExcludeRootJSONProvider preWriteTo with {}", type); + marshaller.setProperty(MarshallerProperties.JSON_MARSHAL_EMPTY_COLLECTIONS, false); + marshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, false); + } +} diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java index f8ce4ab8c2e28..0955508001ec2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -36,55 +36,111 @@ import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.yarn.api.records.ResourceInformation; +/** + * A custom JSON provider that extends {@link org.eclipse.persistence.jaxb.rs.MOXyJsonProvider} + * to ensure that JSON marshalling and unmarshalling + * include the root element for configured classes. + *

+ * This provider integrates with EclipseLink MOXy and the JAX-RS runtime (annotated with + * {@link javax.ws.rs.ext.Provider}), and it is configured to both produce and consume + * {@code application/json} content types. It uses a {@link ClassSerialisationConfig} + * to determine which classes should include + * their root elements when serialized or deserialized. + *

+ * + *

+ * During marshalling and unmarshalling, this provider sets the MOXy-specific properties: + *

    + *
  • {@code MarshallerProperties.JSON_INCLUDE_ROOT = true}
    • + *
  • {@code MarshallerProperties.JSON_MARSHAL_EMPTY_COLLECTIONS = false}
    • + *
+ * ensuring consistent JSON structure that includes the root element and omits empty collections. + *

+ * + *

+ * This class also provides detailed trace logging to help debug compatibility and data binding + * behavior for registered entity types. + *

+ * + * @see org.eclipse.persistence.jaxb.rs.MOXyJsonProvider + * @see org.eclipse.persistence.jaxb.MarshallerProperties + * @see ClassSerialisationConfig + * @see Configuration + */ @Provider @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) public class IncludeRootJSONProvider extends MOXyJsonProvider { - private final static Logger LOG = LoggerFactory.getLogger(IncludeRootJSONProvider.class); - private final ClassSerialisationConfig classSerialisationConfig; - public IncludeRootJSONProvider() { - this(new Configuration()); - } + private final static Logger LOG = LoggerFactory.getLogger(IncludeRootJSONProvider.class); + private final ClassSerialisationConfig classSerialisationConfig; - @Inject - public IncludeRootJSONProvider(@javax.inject.Named("conf") Configuration conf) { - classSerialisationConfig = new ClassSerialisationConfig(conf); - } + /** + * Default constructor + */ + public IncludeRootJSONProvider() { + this(new Configuration()); + } - @Override - public boolean isReadable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - boolean match = classSerialisationConfig.getWrappedClasses().contains(type); - LOG.trace("IncludeRootJSONProvider compatibility with {} is {}", type, match); - return match; - } + /** + * Constructs a new {@code IncludeRootJSONProvider} instance and initializes + * its {@link ClassSerialisationConfig} based on the provided application configuration. + *

+ * This constructor is designed for dependency injection. The {@code Configuration} + * object is injected (qualified with {@code @Named("conf")}) and used to + * create a {@link ClassSerialisationConfig} instance, which controls how + * classes are serialized to JSON (e.g., whether to include root elements). + *

+ * + * @param conf the application {@link Configuration} instance injected by the framework; + * used to initialize serialization settings + */ + @Inject + public IncludeRootJSONProvider(@javax.inject.Named("conf") Configuration conf) { + classSerialisationConfig = new ClassSerialisationConfig(conf); + } - @Override - public boolean isWriteable(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType) { - return isReadable(type, genericType, annotations, mediaType); - } + /** + * {@inheritDoc} + */ + @Override + public boolean isReadable(Class type, Type genericType, Annotation[] annotations, + MediaType mediaType) { + boolean match = classSerialisationConfig.getWrappedClasses().contains(type); + LOG.trace("IncludeRootJSONProvider compatibility with {} is {}", type, match); + return match; + } - @Override - protected void preReadFrom(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, - Unmarshaller unmarshaller) throws JAXBException { - LOG.trace("IncludeRootJSONProvider preReadFrom with {}", type); - unmarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, true); - } + /** + * {@inheritDoc} + */ + @Override + public boolean isWriteable(Class type, Type genericType, Annotation[] annotations, + MediaType mediaType) { + return isReadable(type, genericType, annotations, mediaType); + } - @Override - protected void preWriteTo(Object object, Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, Marshaller marshaller) - throws JAXBException { - LOG.trace("IncludeRootJSONProvider preWriteTo with {}", type); - marshaller.setProperty(MarshallerProperties.JSON_MARSHAL_EMPTY_COLLECTIONS, false); - marshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, true); - } + /** + * {@inheritDoc} + */ + @Override + protected void preReadFrom(Class type, Type genericType, Annotation[] annotations, + MediaType mediaType, MultivaluedMap httpHeaders, Unmarshaller unmarshaller) + throws JAXBException { + LOG.trace("IncludeRootJSONProvider preReadFrom with {}", type); + unmarshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, true); + } + /** + * {@inheritDoc} + */ + @Override + protected void preWriteTo(Object object, Class type, Type genericType, + Annotation[] annotations, MediaType mediaType, MultivaluedMap httpHeaders, + Marshaller marshaller) throws JAXBException { + LOG.trace("IncludeRootJSONProvider preWriteTo with {}", type); + marshaller.setProperty(MarshallerProperties.JSON_MARSHAL_EMPTY_COLLECTIONS, false); + marshaller.setProperty(MarshallerProperties.JSON_INCLUDE_ROOT, true); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java index 8dc8b796855cb..3e26f6dec0fe3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

* Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,10 +21,39 @@ import javax.ws.rs.core.Feature; import javax.ws.rs.core.FeatureContext; -import org.eclipse.persistence.jaxb.MarshallerProperties; import org.glassfish.jersey.CommonProperties; +/** + * A JAX-RS {@link Feature} that registers custom MOXy JSON providers + * for handling serialization and deserialization of JSON with or without + * root elements. + *

+ * This feature disables MOXy's automatic provider discovery to ensure + * that the custom providers {@link IncludeRootJSONProvider} and + * {@link ExcludeRootJSONProvider} are used explicitly with defined priorities. + *

+ * + *

Configuration details:

+ *
    + *
  • Disables automatic MOXy JSON feature discovery by setting + * {@link org.glassfish.jersey.CommonProperties#MOXY_JSON_FEATURE_DISABLE} to {@code true}.
    • + *
  • Registers {@link IncludeRootJSONProvider} with priority {@code 2001}.
    • + *
  • Registers {@link ExcludeRootJSONProvider} with priority {@code 2002}.
    • + *
+ * + * @see IncludeRootJSONProvider + * @see ExcludeRootJSONProvider + * @see org.glassfish.jersey.CommonProperties#MOXY_JSON_FEATURE_DISABLE + */ public class JsonProviderFeature implements Feature { + + /** + * Configures the feature by registering the custom JSON providers + * and disabling MOXy auto-discovery. + * + * @param context the {@link FeatureContext} provided by the JAX-RS runtime + * @return {@code true} to indicate that the feature was successfully configured + */ @Override public boolean configure(FeatureContext context) { //Auto discovery should be disabled to ensure the custom providers will be used diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index 4de46e9b058b3..a0a57c399826a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -24,7 +24,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.http.JettyUtils; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.hadoop.test.tags.FlakyTest; import org.apache.hadoop.util.Sets; import org.apache.hadoop.util.XMLUtils; import org.apache.hadoop.yarn.api.records.ContainerState; @@ -69,7 +68,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import java.io.StringReader; import java.util.ArrayList; -import java.util.Arrays; import java.util.Set; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index 278e93e08f8f4..f783c349bb93b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -30,7 +30,6 @@ import java.io.File; import java.io.IOException; -import java.io.StringReader; import java.net.URL; import java.security.Principal; import java.util.Arrays; @@ -47,7 +46,6 @@ import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBException; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; @@ -1039,7 +1037,7 @@ private ReservationId getReservationIdTestHelper(int fallbackReservationId) assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response).getJSONObject("new-reservation"); + JSONObject json = responseToJson(response).getJSONObject("new-reservation"); assertEquals(1, json.length(), "incorrect number of elements"); ReservationId rid = null; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java index efbf629e930e0..0bd28d8a792aa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java @@ -393,7 +393,7 @@ public static T fromJson(String json, Class klass) { } Unmarshaller unmarshaller = jc.createUnmarshaller(); unmarshaller.setProperty(MarshallerProperties.MEDIA_TYPE, MediaType.APPLICATION_JSON); - return unmarshaller.unmarshal(new StreamSource(new StringReader(json)),klass).getValue(); + return unmarshaller.unmarshal(new StreamSource(new StringReader(json)), klass).getValue(); } catch (Exception e) { throw new RuntimeException("Failed to read from json: " + json, e); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/helper/AppInfoJsonVerifications.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/helper/AppInfoJsonVerifications.java index fdaf90d345ec6..951336da2d14a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/helper/AppInfoJsonVerifications.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/helper/AppInfoJsonVerifications.java @@ -26,9 +26,6 @@ import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.checkStringEqual; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.checkStringMatch; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; /** From 6bebef6c1cb84fd255c716e2b7a9d16656a874d3 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Sat, 18 Oct 2025 11:58:16 +0200 Subject: [PATCH 12/19] - fix TestRMWebServicesNodeLabels - replace expected string to const - remove dead code --- .../TestFederationRMStateStoreService.java | 2 -- .../webapp/TestRMWebServicesApps.java | 8 ++++---- .../webapp/TestRMWebServicesNodeLabels.java | 18 ++++++------------ .../webapp/TestRMWebServicesNodes.java | 4 ++-- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java index 06a93e7cd60aa..c5633c6201678 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/federation/TestFederationRMStateStoreService.java @@ -192,8 +192,6 @@ private void explicitFailover(MockRM rm) throws IOException { private void checkClusterMetricsInfo(String capability, int numNodes) { ClusterMetricsInfo clusterMetricsInfo = fromJson(capability, ClusterMetricsInfo.class); - System.err.println(capability); - System.err.println(clusterMetricsInfo.getTotalNodes()); assertEquals(numNodes, clusterMetricsInfo.getTotalNodes()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index a0a57c399826a..a2e1af1d03eff 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -423,7 +423,7 @@ public void testAppsQueryStatesNone() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty"); + assertEquals("{}", json.get("apps").toString(), "apps is not empty"); rm.stop(); } @@ -443,7 +443,7 @@ public void testAppsQueryStateNone() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty"); + assertEquals("{}", json.get("apps").toString(), "apps is not empty"); rm.stop(); } @@ -557,7 +557,7 @@ public void testAppsQueryFinalStatusNone() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not null"); + assertEquals("{}", json.get("apps").toString(), "apps is not null"); rm.stop(); } @@ -844,7 +844,7 @@ public void testAppsQueryStartEnd() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals(new JSONObject().toString(), json.get("apps").toString(), "apps is not empty"); + assertEquals("{}", json.get("apps").toString(), "apps is not empty"); rm.stop(); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java index 117762527e179..304014068dadf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java @@ -19,6 +19,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; +import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -47,7 +48,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.Lists; -import com.google.gson.Gson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.http.JettyUtils; @@ -209,9 +209,11 @@ private Response post(String path, String queryUserName, Object payload, webTarget = webTarget.queryParam(param.getKey(), value); } } - return webTarget.request(MediaType.APPLICATION_JSON) - .post(Entity.entity(toJson(payload, payloadClass), - MediaType.APPLICATION_JSON), Response.class); + Entity entity = payload == null + ? null + : Entity.entity(toJson(payload, payloadClass) ,MediaType.APPLICATION_JSON); + + return webTarget.request(MediaType.APPLICATION_JSON).post(entity, Response.class); } @Test @@ -691,12 +693,4 @@ public void testNodeLabelPartitionInfo() throws Exception { assertNotNull(nodes.getPartitionInfo()); assertNotNull(nodes.getPartitionInfo().getResourceAvailable()); } - - @SuppressWarnings("rawtypes") - private String toJson(Object obj, Class klass) throws Exception { - if (obj == null) { - return null; - } - return new Gson().toJson(obj, klass); - } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index 3e1aaa10d35fa..2d8d1d2e9d0b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -313,7 +313,7 @@ public void testNodesQueryStateNone() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals(new JSONObject().toString(), json.get("nodes").toString(), "nodes is not empty"); + assertEquals("{}", json.get("nodes").toString(), "nodes is not empty"); } @Test @@ -442,7 +442,7 @@ public void testNodesQueryHealthyFalse() throws JSONException, Exception { response.getMediaType().toString()); JSONObject json = responseToJson(response); assertEquals(1, json.length(), "incorrect number of elements"); - assertEquals(new JSONObject().toString(), json.get("nodes").toString(), "nodes is not empty"); + assertEquals("{}", json.get("nodes").toString(), "nodes is not empty"); } public void testNodesHelper(String path, String media) throws JSONException, From 2dea8098d430d60e0c4ce5add25cd15dad424b05 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Mon, 27 Oct 2025 15:19:22 +0100 Subject: [PATCH 13/19] fix by review --- hadoop-project/pom.xml | 9 +- .../hadoop/yarn/webapp/JerseyTestBase.java | 2 +- .../pom.xml | 4 +- .../resourcemanager/webapp/RMWebApp.java | 1 - .../jsonprovider/JsonProviderFeature.java | 11 +- .../yarn/server/resourcemanager/TestRMHA.java | 3 +- .../webapp/TestRMWebServiceAppsNodelabel.java | 5 +- .../webapp/TestRMWebServices.java | 27 +++-- .../webapp/TestRMWebServicesAppAttempts.java | 11 +- .../webapp/TestRMWebServicesApps.java | 107 +++++++++--------- .../TestRMWebServicesAppsModification.java | 13 +-- .../TestRMWebServicesCapacitySched.java | 3 +- ...estRMWebServicesConfigurationMutation.java | 5 +- .../TestRMWebServicesDelegationTokens.java | 3 +- .../TestRMWebServicesForCSWithPartitions.java | 7 +- .../webapp/TestRMWebServicesNodeLabels.java | 3 +- .../webapp/TestRMWebServicesNodes.java | 33 +++--- .../webapp/TestRMWebServicesReservation.java | 5 +- .../TestRMWebServicesSchedulerActivities.java | 43 ++++--- ...edulerActivitiesWithMultiNodesEnabled.java | 9 +- .../webapp/TestWebServiceUtil.java | 9 -- .../TestRMWebServicesFairScheduler.java | 9 +- .../yarn/webapp/TestRMWithCSRFFilter.java | 1 - 23 files changed, 147 insertions(+), 176 deletions(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 5cbfe598eef4a..febcfdf374af8 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -67,6 +67,9 @@ 2.46 + + 2.7.14 + 2.3.9 @@ -2147,9 +2150,9 @@ ${jersey2.version} - org.glassfish.jersey.media - jersey-media-moxy - ${jersey2.version} + org.eclipse.persistence + org.eclipse.persistence.moxy + ${eclipse-persistence.version} org.glassfish.jaxb diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java index 03996e39f7038..a6ba24b6a712c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java @@ -40,6 +40,6 @@ public void setUp() throws Exception { } public final WebTarget targetWithJsonObject() { - return target(); + return target().register(new JettisonObjectProvider.App()); } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index 5f70fbd9bd2e2..54e9258500a33 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -262,8 +262,8 @@ test - org.glassfish.jersey.media - jersey-media-moxy + org.eclipse.persistence + org.eclipse.persistence.moxy org.mockito diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java index b673e6e37895e..4b795bb580b29 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/RMWebApp.java @@ -23,7 +23,6 @@ import java.net.InetSocketAddress; import org.apache.hadoop.conf.Configuration; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java index 3e26f6dec0fe3..9f8cfa389484c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/JsonProviderFeature.java @@ -21,8 +21,6 @@ import javax.ws.rs.core.Feature; import javax.ws.rs.core.FeatureContext; -import org.glassfish.jersey.CommonProperties; - /** * A JAX-RS {@link Feature} that registers custom MOXy JSON providers * for handling serialization and deserialization of JSON with or without @@ -35,8 +33,6 @@ * *

Configuration details:

*
    - *
  • Disables automatic MOXy JSON feature discovery by setting - * {@link org.glassfish.jersey.CommonProperties#MOXY_JSON_FEATURE_DISABLE} to {@code true}.
    • *
  • Registers {@link IncludeRootJSONProvider} with priority {@code 2001}.
    • *
  • Registers {@link ExcludeRootJSONProvider} with priority {@code 2002}.
    • *
@@ -48,16 +44,15 @@ public class JsonProviderFeature implements Feature { /** - * Configures the feature by registering the custom JSON providers - * and disabling MOXy auto-discovery. + * Configures the feature by registering the custom JSON providers. * * @param context the {@link FeatureContext} provided by the JAX-RS runtime * @return {@code true} to indicate that the feature was successfully configured */ @Override public boolean configure(FeatureContext context) { - //Auto discovery should be disabled to ensure the custom providers will be used - context.property(CommonProperties.MOXY_JSON_FEATURE_DISABLE, true); + // Priorities are used to maintain order between the JSONProviders. + // This way, we can improve the determinism of the app. context.register(IncludeRootJSONProvider.class, 2001); context.register(ExcludeRootJSONProvider.class, 2002); return true; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java index cb2ee2dbfb308..79544c4c93fe6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java @@ -175,8 +175,7 @@ private void checkActiveRMWebServices() throws JSONException { .get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - String raw = response.readEntity(String.class); - JSONObject json = new JSONObject(raw); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject appJson = json.getJSONObject("app"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java index c0dd04ff93d30..1e84f08579233 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java @@ -18,7 +18,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -154,7 +153,7 @@ public void testAppsFinished() throws JSONException, Exception { Response response = r.path("ws").path("v1").path("cluster").path("apps") .request(MediaType.APPLICATION_JSON).get(Response.class); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); try { @@ -195,7 +194,7 @@ public void testAppsRunning() throws JSONException, Exception { Response response = r.path("ws").path("v1").path("cluster").path("apps") .request(MediaType.APPLICATION_JSON).get(Response.class); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); // Verify apps resource JSONObject apps = json.getJSONObject("apps"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java index eee6a416d2c7d..ebfc4e341c9fb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java @@ -18,7 +18,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -244,7 +243,7 @@ public void testCluster() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterInfo(json); } @@ -257,7 +256,7 @@ public void testClusterSlash() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterInfo(json); } @@ -270,7 +269,7 @@ public void testClusterDefault() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterInfo(json); } @@ -283,7 +282,7 @@ public void testInfo() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterInfo(json); } @@ -297,7 +296,7 @@ public void testInfoSlash() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterInfo(json); } @@ -309,7 +308,7 @@ public void testInfoDefault() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterInfo(json); } @@ -397,7 +396,7 @@ public void testClusterMetrics() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterMetricsJSON(json); } @@ -410,7 +409,7 @@ public void testClusterMetricsSlash() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterMetricsJSON(json); } @@ -422,7 +421,7 @@ public void testClusterMetricsDefault() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json =responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterMetricsJSON(json); } @@ -554,7 +553,7 @@ public void testClusterSchedulerFifo() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterSchedulerFifo(json); } @@ -567,7 +566,7 @@ public void testClusterSchedulerFifoSlash() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterSchedulerFifo(json); } @@ -579,7 +578,7 @@ public void testClusterSchedulerFifoDefault() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterSchedulerFifo(json); } @@ -1091,7 +1090,7 @@ public void testClusterSchedulerOverviewFifo() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONObject schedulerJson = json.getJSONObject("scheduler"); verifyClusterSchedulerOverView(schedulerJson, "Fifo Scheduler"); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java index 74467beda7d5f..47a6a66b3d036 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppAttempts.java @@ -63,7 +63,6 @@ import java.io.StringReader; import java.util.Collection; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.checkStringMatch; import static org.assertj.core.api.Assertions.assertThat; @@ -155,7 +154,7 @@ public void testCompletedAppAttempt() throws Exception { .path("apps").path(app1.getApplicationId().toString()) .path("appattempts").request(MediaType.APPLICATION_JSON) .get(Response.class); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONObject jsonAppAttempts = json.getJSONObject("appAttempts"); JSONArray jsonArray = jsonAppAttempts.getJSONArray("appAttempt"); JSONObject info = jsonArray.getJSONObject(0); @@ -247,7 +246,7 @@ public void testInvalidAppIdGetAttempts() throws Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -284,7 +283,7 @@ public void testInvalidAppAttemptId() throws Exception { response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -325,7 +324,7 @@ public void testNonexistAppAttempts() throws Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -349,7 +348,7 @@ private void testAppAttemptsHelper(String path, RMApp app, String media) .get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject jsonAppAttempts = json.getJSONObject("appAttempts"); assertEquals(1, jsonAppAttempts.length(), "incorrect number of elements"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java index a2e1af1d03eff..819d20fef3a32 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesApps.java @@ -70,7 +70,6 @@ import java.util.ArrayList; import java.util.Set; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -277,7 +276,7 @@ public void testAppsHelper(String path, RMApp app, String media, .path(path).request(media).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -301,7 +300,7 @@ public void testAppsQueryState() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -327,7 +326,7 @@ public void testAppsQueryStates() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -343,7 +342,7 @@ public void testAppsQueryStates() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -375,7 +374,7 @@ public void testAppsQueryStatesComma() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -391,7 +390,7 @@ public void testAppsQueryStatesComma() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -421,7 +420,7 @@ public void testAppsQueryStatesNone() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals("{}", json.get("apps").toString(), "apps is not empty"); rm.stop(); @@ -441,7 +440,7 @@ public void testAppsQueryStateNone() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals("{}", json.get("apps").toString(), "apps is not empty"); rm.stop(); @@ -465,7 +464,7 @@ public void testAppsQueryStatesInvalid() throws JSONException, Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -501,7 +500,7 @@ public void testAppsQueryStateInvalid() throws JSONException, Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -532,7 +531,7 @@ public void testAppsQueryFinalStatus() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -555,7 +554,7 @@ public void testAppsQueryFinalStatusNone() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals("{}", json.get("apps").toString(), "apps is not null"); rm.stop(); @@ -579,7 +578,7 @@ public void testAppsQueryFinalStatusInvalid() throws Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -616,7 +615,7 @@ public void testAppsQueryUser() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); @@ -641,7 +640,7 @@ public void testAppsQueryQueue() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -670,7 +669,7 @@ public void testAppsQueryQueueAndStateTwoFinishedApps() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -705,7 +704,7 @@ public void testAppsQueryQueueAndStateOneFinishedApp() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -740,7 +739,7 @@ public void testAppsQueryQueueOneFinishedApp() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -770,7 +769,7 @@ public void testAppsQueryLimit() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -794,7 +793,7 @@ public void testAppsQueryStartBegin() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -818,7 +817,7 @@ public void testAppsQueryStartBeginSome() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -842,7 +841,7 @@ public void testAppsQueryStartEnd() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals("{}", json.get("apps").toString(), "apps is not empty"); rm.stop(); @@ -866,7 +865,7 @@ public void testAppsQueryStartBeginEnd() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -893,7 +892,7 @@ public void testAppsQueryFinishBegin() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -931,7 +930,7 @@ public void testAppsQueryFinishEnd() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -962,7 +961,7 @@ public void testAppsQueryFinishBeginEnd() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1012,7 +1011,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1028,7 +1027,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1048,7 +1047,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1067,7 +1066,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1082,7 +1081,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1097,7 +1096,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1113,7 +1112,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1128,7 +1127,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1141,7 +1140,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1162,7 +1161,7 @@ public void testAppsQueryAppTypes() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1193,7 +1192,7 @@ public void testAppsQueryWithInvalidDeselects() assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -1228,7 +1227,7 @@ public void testAppsQueryWithDeselects() assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1243,7 +1242,7 @@ public void testAppsQueryWithDeselects() assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1259,7 +1258,7 @@ public void testAppsQueryWithDeselects() assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1276,7 +1275,7 @@ public void testAppsQueryWithDeselects() assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1293,7 +1292,7 @@ public void testAppsQueryWithDeselects() assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -1357,7 +1356,7 @@ public void testAppStatistics() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject appsStatInfo = json.getJSONObject("appStatInfo"); assertEquals(1, appsStatInfo.length(), "incorrect number of elements"); @@ -1384,7 +1383,7 @@ public void testAppStatistics() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); appsStatInfo = json.getJSONObject("appStatInfo"); assertEquals(1, appsStatInfo.length(), "incorrect number of elements"); @@ -1402,7 +1401,7 @@ public void testAppStatistics() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); appsStatInfo = json.getJSONObject("appStatInfo"); assertEquals(1, appsStatInfo.length(), "incorrect number of elements"); @@ -1430,7 +1429,7 @@ public void testAppStatistics() throws JSONException, Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject exception = json.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); @@ -1454,7 +1453,7 @@ public void testAppStatistics() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); appsStatInfo = json.getJSONObject("appStatInfo"); assertEquals(1, appsStatInfo.length(), "incorrect number of elements"); @@ -1479,7 +1478,7 @@ public void testAppStatistics() throws JSONException, Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); exception = json.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); @@ -1581,7 +1580,7 @@ public void testInvalidApp() throws JSONException, Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -1623,7 +1622,7 @@ public void testNonexistApp() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -1647,7 +1646,7 @@ public void testSingleAppsHelper(String path, RMApp app, String media) .path("apps").path(path).request(media).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); verifyAppInfo(json.getJSONObject("app"), app, false); @@ -1965,7 +1964,7 @@ public void testAppsQueryByQueueShortname() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); @@ -2030,7 +2029,7 @@ public void testAppsQueryByQueueFullname() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject apps = json.getJSONObject("apps"); assertEquals(1, apps.length(), "incorrect number of elements"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index fc14fb4f10795..5a23a76bbfa89 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -18,7 +18,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -520,7 +519,7 @@ protected static void verifyAppStateJson(Response response, assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); String responseState = json.getString("state"); boolean valid = false; @@ -718,7 +717,7 @@ protected String validateGetNewApplicationResponse(Response resp) SAXException { String ret = ""; if (resp.getMediaType().toString().contains(MediaType.APPLICATION_JSON)) { - JSONObject json = responseToJson(resp); + JSONObject json = resp.readEntity(JSONObject.class); ret = validateGetNewApplicationJsonResponse(json); } else if (resp.getMediaType().toString().contains(MediaType.APPLICATION_XML)) { String xml = resp.readEntity(String.class); @@ -1283,7 +1282,7 @@ protected static void verifyAppPriorityJson(Response response, int expectedPriority) throws JSONException { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); int responsePriority = json.getInt("priority"); assertEquals(expectedPriority, responsePriority); @@ -1311,7 +1310,7 @@ protected static void verifyAppQueueJson(Response response, String queue) throws JSONException { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); String responseQueue = json.getString("queue"); assertEquals(queue, responseQueue); @@ -1363,7 +1362,7 @@ public void testUpdateAppTimeout(int run) throws Exception { MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); JSONObject js = - responseToJson(response).getJSONObject("timeouts"); + response.readEntity(JSONObject.class).getJSONObject("timeouts"); JSONArray entity = js.getJSONArray("timeout"); verifyAppTimeoutJson(entity.getJSONObject(0), ApplicationTimeoutType.LIFETIME, "UNLIMITED", -1); @@ -1440,7 +1439,7 @@ protected static void verifyAppTimeoutJson(Response response, throws JSONException { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject jsonTimeout = responseToJson(response); + JSONObject jsonTimeout = response.readEntity(JSONObject.class); assertEquals(1, jsonTimeout.length(), "incorrect number of elements"); JSONObject json = jsonTimeout.getJSONObject("timeout"); verifyAppTimeoutJson(json, type, expireTime, timeOutFromNow); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java index ce3408c6d1dc7..df23270da5f3a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java @@ -55,7 +55,6 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.assertXmlResponse; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.backupSchedulerConfigFileInTarget; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.createRM; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.restoreSchedulerConfigFileInTarget; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; @@ -180,7 +179,7 @@ public void testClusterSchedulerOverviewCapacity(boolean pLegacyQueueMode) throw Response response = targetWithJsonObject().path("ws/v1/cluster/scheduler-overview") .request(MediaType.APPLICATION_JSON).get(Response.class); assertJsonType(response); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONObject scheduler = json.getJSONObject("scheduler"); TestRMWebServices.verifyClusterSchedulerOverView(scheduler, "Capacity Scheduler"); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java index e788f48689110..8ffd187d7a494 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java @@ -72,7 +72,6 @@ import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.MAXIMUM_CAPACITY; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.getCapacitySchedulerConfigFileInTarget; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.backupSchedulerConfigFileInTarget; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.restoreSchedulerConfigFileInTarget; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -206,7 +205,7 @@ private CapacitySchedulerConfiguration getSchedulerConf() .request(MediaType.APPLICATION_JSON) .get(Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONArray items = (JSONArray) json.get("property"); CapacitySchedulerConfiguration parsedConf = new CapacitySchedulerConfiguration(); @@ -273,7 +272,7 @@ private long getConfigVersion() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(Status.OK.getStatusCode(), response.getStatus()); - JSONObject json = responseToJson(response). + JSONObject json = response.readEntity(JSONObject.class). getJSONObject("configversion"); return Long.parseLong(json.get("versionID").toString()); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java index dd02e7eab61e7..bb60d45abd068 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesDelegationTokens.java @@ -19,7 +19,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.createRM; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import java.io.File; @@ -749,7 +748,7 @@ private void verifySimpleAuthCancel() { throws IOException, ParserConfigurationException, SAXException, JSONException { if (response.getMediaType().toString().contains(MediaType.APPLICATION_JSON)) { - return getDelegationTokenFromJson(responseToJson(response)); + return getDelegationTokenFromJson(response.readEntity(JSONObject.class)); } return getDelegationTokenFromXML(response.readEntity(String.class)); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java index 0fa91a1dec4fa..8b4b2fa3f7481 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java @@ -26,7 +26,6 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.getFirstSubNodeFromJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyNumberOfAllocations; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.createRM; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -285,7 +284,7 @@ public void testSchedulerPartitions(boolean pLegacyQueueMode) throws JSONExcepti .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifySchedulerInfoJson(json); } @@ -300,7 +299,7 @@ public void testSchedulerPartitionsSlash(boolean pLegacyQueueMode) .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifySchedulerInfoJson(json); } @@ -315,7 +314,7 @@ public void testSchedulerPartitionsDefault(boolean pLegacyQueueMode) .path("scheduler").request().get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifySchedulerInfoJson(json); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java index 304014068dadf..521ca9aceb416 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java @@ -18,7 +18,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -619,7 +618,7 @@ private void validateJsonExceptionContent(Response response, String expectedMessage) throws JSONException { assertEquals(BAD_REQUEST_CODE, response.getStatus()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); String message = exception.getString("message"); assertEquals(3, exception.length(), "incorrect number of elements"); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index 2d8d1d2e9d0b0..40566527690c1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -19,7 +19,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import static org.apache.hadoop.yarn.server.resourcemanager.MockNM.createMockNodeStatus; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.assertj.core.api.Assertions.assertThat; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -238,7 +237,7 @@ public void testNodesDefaultWithUnHealthyNode() throws JSONException, assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); @@ -288,7 +287,7 @@ public void testNodesQueryNew() throws Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); @@ -311,7 +310,7 @@ public void testNodesQueryStateNone() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals("{}", json.get("nodes").toString(), "nodes is not empty"); } @@ -362,7 +361,7 @@ public void testNodesQueryStateLost() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); JSONArray nodeArray = nodes.getJSONArray("node"); @@ -394,7 +393,7 @@ public void testSingleNodeQueryStateLost() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONObject info = json.getJSONObject("node"); String id = info.get("id").toString(); @@ -421,7 +420,7 @@ public void testNodesQueryRunning() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); @@ -440,7 +439,7 @@ public void testNodesQueryHealthyFalse() throws JSONException, Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); assertEquals("{}", json.get("nodes").toString(), "nodes is not empty"); } @@ -455,7 +454,7 @@ public void testNodesHelper(String path, String media) throws JSONException, .path(path).request(media).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); @@ -502,7 +501,7 @@ public void testSingleNodeHelper(String nodeid, RMNode nm, String media) assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject info = json.getJSONObject("node"); verifyNodeInfo(info, nm); @@ -522,7 +521,7 @@ public void testNonexistNode() throws Exception { assertResponseStatusCode(Response.Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -544,7 +543,7 @@ public void testNonexistNodeDefault() throws Exception { assertResponseStatusCode(Response.Status.NOT_FOUND, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -597,7 +596,7 @@ public void testInvalidNode() throws Exception { assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject msg = responseToJson(response); + JSONObject msg = response.readEntity(JSONObject.class); JSONObject exception = msg.getJSONObject("RemoteException"); assertEquals(3, exception.length(), "incorrect number of elements"); String message = exception.getString("message"); @@ -697,7 +696,7 @@ public void testQueryAll() throws Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); JSONArray nodeArray = nodes.getJSONArray("node"); @@ -730,7 +729,7 @@ public void testNodesResourceUtilization() throws JSONException, Exception { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals(1, json.length(), "incorrect number of elements"); JSONObject nodes = json.getJSONObject("nodes"); assertEquals(1, nodes.length(), "incorrect number of elements"); @@ -790,7 +789,7 @@ public void testUpdateNodeResource() throws Exception { .request(MediaType.APPLICATION_JSON) .post(Entity.json(resourceOption), Response.class); assertResponseStatusCode(Response.Status.BAD_REQUEST, response.getStatusInfo()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONObject exception = json.getJSONObject("RemoteException"); assertEquals("IllegalArgumentException", exception.getString("exception")); String msg = exception.getString("message"); @@ -966,7 +965,7 @@ public void testNodesAllocationTags() throws Exception { .path("nodes").request("application/json").get(Response.class); assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject nodesInfoJson = responseToJson(response); + JSONObject nodesInfojson = response.readEntity(JSONObject.class); verifyNodeAllocationTag(nodesInfoJson, expectedAllocationTags); rm.stop(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java index f783c349bb93b..40f78b44b98d9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesReservation.java @@ -19,7 +19,6 @@ package org.apache.hadoop.yarn.server.resourcemanager.webapp; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.fromJson; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.toJson; import static org.assertj.core.api.Assertions.assertThat; import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; @@ -1037,7 +1036,7 @@ private ReservationId getReservationIdTestHelper(int fallbackReservationId) assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response).getJSONObject("new-reservation"); + JSONObject json = response.readEntity(JSONObject.class).getJSONObject("new-reservation"); assertEquals(1, json.length(), "incorrect number of elements"); ReservationId rid = null; @@ -1204,7 +1203,7 @@ private JSONObject testListReservationHelper(WebTarget target, Response.Status response.getMediaType().toString()); assertResponseStatusCode(status, response.getStatusInfo()); - return responseToJson(response); + return response.readEntity(JSONObject.class); } private void verifyReservationCount(int count) throws Exception { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java index a807cdf22ddb5..78d8b0405fdec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java @@ -99,7 +99,6 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyNumberOfNodes; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyQueueOrder; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyStateOfAllocations; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -230,7 +229,7 @@ public void testAssignMultipleContainersPerNodeHeartbeat() MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); nm.nodeHeartbeat(true); Thread.sleep(1000); @@ -241,7 +240,7 @@ public void testAssignMultipleContainersPerNodeHeartbeat() MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); // Collection logic of scheduler activities changed after YARN-9313, // only one allocation should be recorded for all scenarios. @@ -294,7 +293,7 @@ public void testAssignWithoutAvailableResource() throws Exception { request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); nm.nodeHeartbeat(true); Thread.sleep(1000); @@ -305,7 +304,7 @@ public void testAssignWithoutAvailableResource() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); // verify scheduler activities verifyNumberOfAllocations(json, 1); @@ -333,7 +332,7 @@ public void testNoNM() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); Thread.sleep(1000); @@ -343,7 +342,7 @@ public void testNoNM() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); verifyNumberOfAllocations(json, 0); } finally { @@ -386,7 +385,7 @@ public void testWrongNodeId() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); nm.nodeHeartbeat(true); Thread.sleep(1000); @@ -397,7 +396,7 @@ public void testWrongNodeId() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); verifyNumberOfAllocations(json, 0); } finally { @@ -452,7 +451,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); nm2.nodeHeartbeat(true); Thread.sleep(1000); @@ -462,7 +461,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); verifyNumberOfAllocations(json, 1); @@ -480,7 +479,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); nm2.nodeHeartbeat(true); Thread.sleep(1000); @@ -490,7 +489,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); verifyNumberOfAllocations(json, 1); @@ -515,7 +514,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); nm2.nodeHeartbeat(true); Thread.sleep(1000); @@ -525,7 +524,7 @@ public void testReserveNewContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); verifyNumberOfAllocations(json, 1); @@ -566,7 +565,7 @@ public void testActivityJSON() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); nm.nodeHeartbeat(true); Thread.sleep(1000); @@ -577,7 +576,7 @@ public void testActivityJSON() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); verifyNumberOfAllocations(json, 1); @@ -893,7 +892,7 @@ public void testInsufficientResourceDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals("waiting for next allocation", getFirstSubNodeFromJson(json, FN_SCHEDULER_ACT_ROOT) .optString(FN_ACT_DIAGNOSTIC)); @@ -911,7 +910,7 @@ public void testInsufficientResourceDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); verifyNumberOfAllocations(json, 1); JSONObject allocationObj = getFirstSubNodeFromJson(json, @@ -967,7 +966,7 @@ public void testPlacementConstraintDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals("waiting for next allocation", getFirstSubNodeFromJson(json, FN_SCHEDULER_ACT_ROOT) .optString(FN_ACT_DIAGNOSTIC)); @@ -981,7 +980,7 @@ public void testPlacementConstraintDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); verifyNumberOfAllocations(json, 1); JSONObject allocationObj = getFirstSubNodeFromJson(json, @@ -1764,7 +1763,7 @@ public void run() { assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); done = true; } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java index e112f53eca936..ac9a31fef8833 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivitiesWithMultiNodesEnabled.java @@ -82,7 +82,6 @@ import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyNumberOfAllocationAttempts; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyNumberOfAllocations; import static org.apache.hadoop.yarn.server.resourcemanager.webapp.ActivitiesTestUtils.verifyStateOfAllocations; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -218,7 +217,7 @@ public void testAssignContainer() throws Exception { MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyNumberOfAllocations(json, 1); @@ -262,7 +261,7 @@ public void testSchedulingWithoutPendingRequests() MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyNumberOfAllocations(json, 1); JSONObject allocation = getFirstSubNodeFromJson(json, @@ -376,7 +375,7 @@ public void testInsufficientResourceDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); assertEquals("waiting for next allocation", json.getJSONObject(FN_SCHEDULER_ACT_ROOT).getString("diagnostic")); @@ -390,7 +389,7 @@ public void testInsufficientResourceDiagnostic() throws Exception { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - json = responseToJson(response); + json = response.readEntity(JSONObject.class); //Check app activities verifyNumberOfAllocations(json, 1); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java index 0bd28d8a792aa..443e2332c8cfa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java @@ -345,15 +345,6 @@ public static void restoreSchedulerConfigFileInTarget() { } } - public static JSONObject responseToJson(Response response) { - String res = response.readEntity(String.class); - try { - return new JSONObject(res); - } catch (JSONException e) { - throw new RuntimeException("Failed to parse JSON: " + res, e); - } - } - public static String toEntity(Object obj, Class klass, String mediaType) throws Exception { if (MediaType.APPLICATION_JSON.equals(mediaType)) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java index f5ca6e92d21dd..bc7b02caf6133 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/fairscheduler/TestRMWebServicesFairScheduler.java @@ -48,7 +48,6 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import static org.apache.hadoop.yarn.server.resourcemanager.webapp.TestWebServiceUtil.responseToJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.mock; @@ -105,7 +104,7 @@ public void testClusterScheduler() throws JSONException { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterScheduler(json); } @@ -116,7 +115,7 @@ public void testClusterSchedulerSlash() throws JSONException { .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); verifyClusterScheduler(json); } @@ -134,7 +133,7 @@ public void testClusterSchedulerWithSubQueues() .request(MediaType.APPLICATION_JSON).get(Response.class); assertEquals(MediaType.APPLICATION_JSON_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONArray subQueueInfo = json.getJSONObject("scheduler") .getJSONObject("schedulerInfo").getJSONObject("rootQueue") .getJSONObject("childQueues").getJSONArray("queue").getJSONObject(0) @@ -170,7 +169,7 @@ public void testClusterSchedulerOverviewFair() throws Exception { .get(Response.class); assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject json = responseToJson(response); + JSONObject json = response.readEntity(JSONObject.class); JSONObject scheduler = json.getJSONObject("scheduler"); TestRMWebServices.verifyClusterSchedulerOverView(scheduler, "Fair Scheduler"); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java index a9be28c4c20f0..142cd12eea05d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java @@ -168,7 +168,6 @@ public void testAllowNonBrowserInteractionWithoutHeader() throws Exception { assertEquals(MediaType.APPLICATION_XML_TYPE + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); String xml = response.readEntity(String.class); - System.err.println(xml); verifyClusterInfoXML(xml); } From bf4606f53aa856b04bd35b62c37734a34bfe8178 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Mon, 27 Oct 2025 19:11:32 +0100 Subject: [PATCH 14/19] fix compile error --- .../server/resourcemanager/webapp/TestRMWebServicesNodes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index 40566527690c1..83257f9b04214 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -965,7 +965,7 @@ public void testNodesAllocationTags() throws Exception { .path("nodes").request("application/json").get(Response.class); assertEquals(MediaType.APPLICATION_JSON + ";" + JettyUtils.UTF_8, response.getMediaType().toString()); - JSONObject nodesInfojson = response.readEntity(JSONObject.class); + JSONObject nodesInfoJson = response.readEntity(JSONObject.class); verifyNodeAllocationTag(nodesInfoJson, expectedAllocationTags); rm.stop(); From 3fa4405af7f24f0cc691c4bf92929d4ccec68e62 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Tue, 28 Oct 2025 13:23:12 +0100 Subject: [PATCH 15/19] fix missing dependency stabilize tests --- hadoop-project/pom.xml | 14 +++- .../pom.xml | 8 ++ .../TestRMWebServicesAppsModification.java | 8 +- ...rvicesCapacitySchedulerConfigMutation.java | 4 + ...estRMWebServicesConfigurationMutation.java | 74 ++++++++++++++----- .../webapp/TestRMWebServicesNodeLabels.java | 8 +- .../webapp/TestRMWebServicesNodes.java | 6 ++ .../TestRMWebServicesSchedulerActivities.java | 2 + 8 files changed, 102 insertions(+), 22 deletions(-) diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index febcfdf374af8..06c74f71315ba 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -67,8 +67,10 @@ 2.46 - + 2.7.14 + 1.1.6 + 1.1.4 2.3.9 @@ -2154,6 +2156,16 @@ org.eclipse.persistence.moxy ${eclipse-persistence.version} + + jakarta.json + jakarta.json-api + ${jsonapi.version} + + + org.glassfish + javax.json + ${json.version} + org.glassfish.jaxb jaxb-runtime diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index 54e9258500a33..98f33dd0501e1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -265,6 +265,14 @@ org.eclipse.persistence org.eclipse.persistence.moxy + + jakarta.json + jakarta.json-api + + + org.glassfish + javax.json + org.mockito mockito-junit-jupiter diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java index 5a23a76bbfa89..a88f8a1acae0e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesAppsModification.java @@ -104,6 +104,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.CredentialsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LocalResourceInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.LogAggregationContextInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.util.Times; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; @@ -113,6 +115,7 @@ import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; +import org.glassfish.jersey.jettison.internal.entity.JettisonObjectProvider; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.params.ParameterizedTest; @@ -332,7 +335,10 @@ private WebTarget constructWebResource(WebTarget r, String... paths) { } private WebTarget constructWebResource(String... paths) { - WebTarget r = target(); + WebTarget r = target() + .register(JettisonObjectProvider.App.class) + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); WebTarget ws = r.path("ws").path("v1").path("cluster"); return this.constructWebResource(ws, paths); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java index 4f252bfd3ec33..d76cd87ef222e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySchedulerConfigMutation.java @@ -36,6 +36,8 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.dao.QueueConfigInfo; @@ -157,6 +159,8 @@ public void testUpdateAbsoluteHierarchyWithZeroCapacities(boolean pLegacyQueueMo updateInfo.getUpdateQueueInfo().add(b); Response response = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()) .path("ws/v1/cluster/scheduler-conf") .queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java index 8ffd187d7a494..33c26ae7ec3a4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java @@ -35,6 +35,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.QueuePrefixes; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeLabelsInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; @@ -245,7 +247,9 @@ public void testFormatSchedulerConf() throws Exception { updateInfo.getUpdateQueueInfo().add(stoppedInfo); // Add a queue root.formattest to the existing three queues - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response = r.path("ws").path("v1").path("cluster") .path("scheduler-conf").queryParam("user.name", userName) .request(MediaType.APPLICATION_JSON) @@ -290,7 +294,9 @@ public void testAddNestedQueue() throws Exception { assertNotNull(orgConf); assertEquals(4, orgConf.getQueues(ROOT).size()); - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -335,7 +341,9 @@ public void testAddNestedQueue() throws Exception { @Test public void testAddWithUpdate() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -365,7 +373,9 @@ public void testAddWithUpdate() throws Exception { @Test public void testUnsetParentQueueOrderingPolicy() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; // Update ordering policy of Leaf Queue root.b to fair @@ -412,7 +422,9 @@ public void testUnsetParentQueueOrderingPolicy() throws Exception { @Test public void testUnsetLeafQueueOrderingPolicy() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; // Update ordering policy of Parent Queue root.c to priority-utilization @@ -456,7 +468,9 @@ public void testUnsetLeafQueueOrderingPolicy() throws Exception { @Test public void testRemoveQueue() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -482,7 +496,9 @@ public void testRemoveQueue() throws Exception { @Test public void testStopWithRemoveQueue() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -511,7 +527,9 @@ public void testStopWithRemoveQueue() throws Exception { @Test public void testRemoveQueueWhichHasQueueMapping() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; CapacityScheduler cs = (CapacityScheduler) rm.getResourceScheduler(); @@ -550,7 +568,9 @@ public void testRemoveQueueWhichHasQueueMapping() throws Exception { @Test public void testStopWithConvertLeafToParentQueue() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; // Set state of queues to STOPPED. @@ -581,7 +601,9 @@ public void testStopWithConvertLeafToParentQueue() throws Exception { @Test public void testRemoveParentQueue() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -604,7 +626,9 @@ public void testRemoveParentQueue() throws Exception { @Test public void testRemoveParentQueueWithCapacity() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -634,7 +658,9 @@ public void testRemoveParentQueueWithCapacity() throws Exception { @Test public void testRemoveMultipleQueues() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -661,7 +687,9 @@ public void testRemoveMultipleQueues() throws Exception { } private void stopQueue(QueuePath... queuePaths) throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -689,7 +717,9 @@ private void stopQueue(QueuePath... queuePaths) throws Exception { @Test public void testUpdateQueue() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -740,7 +770,9 @@ public void testUpdateQueue() throws Exception { @Test public void testUpdateQueueCapacity() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -767,7 +799,9 @@ public void testUpdateQueueCapacity() throws Exception { @Test public void testGlobalConfChange() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; @@ -804,7 +838,9 @@ public void testGlobalConfChange() throws Exception { @Test public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); Response response; // 1. Create Node Label: label1 @@ -1007,7 +1043,9 @@ private String getAccessibleNodeLabelsMaxCapacityPropertyName(String label) { @Test public void testValidateWithClusterMaxAllocation() throws Exception { - WebTarget r = target(); + WebTarget r = target() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()); int clusterMax = YarnConfiguration. DEFAULT_RM_SCHEDULER_MAXIMUM_ALLOCATION_MB * 2; conf.setInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java index 521ca9aceb416..0cfaf06609c91 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java @@ -60,6 +60,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntry; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeToLabelsEntryList; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; @@ -162,8 +164,10 @@ public TestRMWebServicesNodeLabels() { } private WebTarget getClusterWebResource() { - return targetWithJsonObject(). - path(PATH_WS).path(PATH_V1).path(PATH_CLUSTER); + return targetWithJsonObject() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()) + .path(PATH_WS).path(PATH_V1).path(PATH_CLUSTER); } private Response get(String path) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index 83257f9b04214..280b4a79cd177 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -88,6 +88,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.NodeInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.ResourceOptionInfo; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.util.Records; import org.apache.hadoop.yarn.util.RackResolver; @@ -96,6 +98,8 @@ import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; + +import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; @@ -744,6 +748,8 @@ public void testNodesResourceUtilization() throws JSONException, Exception { @Test public void testUpdateNodeResource() throws Exception { WebTarget r = targetWithJsonObject() + .register(new IncludeRootJSONProvider()) + .register(new ExcludeRootJSONProvider()) .path(RMWSConsts.RM_WEB_SERVICE_PATH); r = r.queryParam("user.name", userName); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java index 78d8b0405fdec..43642cbb900fb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java @@ -30,6 +30,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityDiagnosticConstant; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityState; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider; +import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; From 11d59a27e1b192e76e54ecfd6136bd917dcf1b0b Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Tue, 28 Oct 2025 16:04:31 +0100 Subject: [PATCH 16/19] remove unused imports --- .../server/resourcemanager/webapp/TestRMWebServicesNodes.java | 1 - .../webapp/TestRMWebServicesSchedulerActivities.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index 280b4a79cd177..f2295ab777d6c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -99,7 +99,6 @@ import org.apache.hadoop.yarn.webapp.JerseyTestBase; import org.apache.hadoop.yarn.webapp.WebServicesTestUtils; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java index 43642cbb900fb..78d8b0405fdec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesSchedulerActivities.java @@ -30,8 +30,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityDiagnosticConstant; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.activities.ActivityState; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.ExcludeRootJSONProvider; -import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.IncludeRootJSONProvider; import org.apache.hadoop.yarn.server.resourcemanager.webapp.jsonprovider.JsonProviderFeature; import org.apache.hadoop.yarn.webapp.GenericExceptionHandler; import org.apache.hadoop.yarn.webapp.JerseyTestBase; From 0fdf3a9380fe54474b3d3cc4cc7d2f2d82267d09 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Wed, 29 Oct 2025 14:18:30 +0100 Subject: [PATCH 17/19] fix TestRMHA --- .../apache/hadoop/yarn/server/resourcemanager/TestRMHA.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java index 79544c4c93fe6..0c21ccbf38600 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java @@ -42,6 +42,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.glassfish.jersey.jettison.internal.entity.JettisonObjectProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; @@ -161,7 +162,9 @@ private void checkActiveRMFunctionality() throws Exception { private void checkActiveRMWebServices() throws JSONException { // Validate web-service - Client webServiceClient = ClientBuilder.newClient(); + Client webServiceClient = ClientBuilder + .newClient() + .register(new JettisonObjectProvider.App()); InetSocketAddress rmWebappAddr = NetUtils.getConnectAddress(rm.getWebapp().getListenerAddress()); String webappURL = From 36b4626603dd09f6de957966a61156931e436d73 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Mon, 3 Nov 2025 11:20:27 +0100 Subject: [PATCH 18/19] fix style --- .../ClassSerialisationConfig.java | 4 +-- .../jsonprovider/ExcludeRootJSONProvider.java | 2 +- .../jsonprovider/IncludeRootJSONProvider.java | 2 +- ...estRMWebServicesConfigurationMutation.java | 35 +++++++++---------- .../webapp/TestRMWebServicesNodeLabels.java | 2 +- .../webapp/TestWebServiceUtil.java | 2 -- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java index d70ae2e2578b9..a31501450c5a4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java @@ -169,7 +169,7 @@ public class ClassSerialisationConfig { private final Set> unWrappedClasses; /** - * Default constructor + * Default constructor. */ public ClassSerialisationConfig() { this(new Configuration()); @@ -194,7 +194,7 @@ public ClassSerialisationConfig(@javax.inject.Named("conf") Configuration conf) unWrappedClasses = new HashSet<>(CONST_UNWRAPPED_CLASSES); try { - wrappedClasses.addAll(Arrays.asList( + unWrappedClasses.addAll(Arrays.asList( conf.getClasses(YarnConfiguration.YARN_HTTP_WEBAPP_CUSTOM_UNWRAPPED_DAO_CLASSES))); } catch (RuntimeException e) { LOG.warn("Failed to load YARN_HTTP_WEBAPP_CUSTOM_DAO_CLASSES", e); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java index 845654a35c54f..d3ecf436e5c8b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ExcludeRootJSONProvider.java @@ -79,7 +79,7 @@ public class ExcludeRootJSONProvider extends MOXyJsonProvider { private final ClassSerialisationConfig classSerialisationConfig; /** - * Default constructor + * Default constructor. */ public ExcludeRootJSONProvider() { this(new Configuration()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java index 0955508001ec2..ad43085bcdcb6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/IncludeRootJSONProvider.java @@ -77,7 +77,7 @@ public class IncludeRootJSONProvider extends MOXyJsonProvider { private final ClassSerialisationConfig classSerialisationConfig; /** - * Default constructor + * Default constructor. */ public IncludeRootJSONProvider() { this(new Configuration()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java index 33c26ae7ec3a4..62306fa67e550 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesConfigurationMutation.java @@ -247,7 +247,7 @@ public void testFormatSchedulerConf() throws Exception { updateInfo.getUpdateQueueInfo().add(stoppedInfo); // Add a queue root.formattest to the existing three queues - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); Response response = r.path("ws").path("v1").path("cluster") @@ -294,7 +294,7 @@ public void testAddNestedQueue() throws Exception { assertNotNull(orgConf); assertEquals(4, orgConf.getQueues(ROOT).size()); - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -341,7 +341,7 @@ public void testAddNestedQueue() throws Exception { @Test public void testAddWithUpdate() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -373,7 +373,7 @@ public void testAddWithUpdate() throws Exception { @Test public void testUnsetParentQueueOrderingPolicy() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); Response response; @@ -422,7 +422,7 @@ public void testUnsetParentQueueOrderingPolicy() throws Exception { @Test public void testUnsetLeafQueueOrderingPolicy() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); Response response; @@ -471,7 +471,6 @@ public void testRemoveQueue() throws Exception { WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); - Response response; stopQueue(ROOT_A_A2); @@ -496,7 +495,7 @@ public void testRemoveQueue() throws Exception { @Test public void testStopWithRemoveQueue() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -527,7 +526,7 @@ public void testStopWithRemoveQueue() throws Exception { @Test public void testRemoveQueueWhichHasQueueMapping() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -568,7 +567,7 @@ public void testRemoveQueueWhichHasQueueMapping() throws Exception { @Test public void testStopWithConvertLeafToParentQueue() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); Response response; @@ -601,7 +600,7 @@ public void testStopWithConvertLeafToParentQueue() throws Exception { @Test public void testRemoveParentQueue() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -626,7 +625,7 @@ public void testRemoveParentQueue() throws Exception { @Test public void testRemoveParentQueueWithCapacity() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -658,7 +657,7 @@ public void testRemoveParentQueueWithCapacity() throws Exception { @Test public void testRemoveMultipleQueues() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -687,7 +686,7 @@ public void testRemoveMultipleQueues() throws Exception { } private void stopQueue(QueuePath... queuePaths) throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -717,7 +716,7 @@ private void stopQueue(QueuePath... queuePaths) throws Exception { @Test public void testUpdateQueue() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -770,7 +769,7 @@ public void testUpdateQueue() throws Exception { @Test public void testUpdateQueueCapacity() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -799,7 +798,7 @@ public void testUpdateQueueCapacity() throws Exception { @Test public void testGlobalConfChange() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); @@ -838,7 +837,7 @@ public void testGlobalConfChange() throws Exception { @Test public void testNodeLabelRemovalResidualConfigsAreCleared() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); Response response; @@ -1043,7 +1042,7 @@ private String getAccessibleNodeLabelsMaxCapacityPropertyName(String label) { @Test public void testValidateWithClusterMaxAllocation() throws Exception { - WebTarget r = target() + WebTarget r = target() .register(new IncludeRootJSONProvider()) .register(new ExcludeRootJSONProvider()); int clusterMax = YarnConfiguration. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java index 0cfaf06609c91..26b8382d65df1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodeLabels.java @@ -214,7 +214,7 @@ private Response post(String path, String queryUserName, Object payload, } Entity entity = payload == null ? null - : Entity.entity(toJson(payload, payloadClass) ,MediaType.APPLICATION_JSON); + : Entity.entity(toJson(payload, payloadClass), MediaType.APPLICATION_JSON); return webTarget.request(MediaType.APPLICATION_JSON).post(entity, Response.class); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java index 443e2332c8cfa..f3e2a504df6ae 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestWebServiceUtil.java @@ -55,8 +55,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.SerializationFeature; -import org.codehaus.jettison.json.JSONException; -import org.codehaus.jettison.json.JSONObject; import org.eclipse.persistence.jaxb.MarshallerProperties; import org.w3c.dom.Document; import org.xml.sax.InputSource; From 609fa5bf74c6b841255679529a7f6f44d59a9b06 Mon Sep 17 00:00:00 2001 From: K0K0V0K Date: Fri, 7 Nov 2025 14:39:58 +0100 Subject: [PATCH 19/19] add container info --- .../jsonprovider/ClassSerialisationConfig.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java index a31501450c5a4..fea5a1590ba3b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/jsonprovider/ClassSerialisationConfig.java @@ -82,6 +82,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.StatisticsItemInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.UserMetricsInfo; import org.apache.hadoop.yarn.server.resourcemanager.webapp.dao.UsersInfo; +import org.apache.hadoop.yarn.server.webapp.dao.ContainerInfo; import org.apache.hadoop.yarn.webapp.RemoteExceptionData; import org.apache.hadoop.yarn.webapp.dao.ConfInfo; import org.apache.hadoop.yarn.webapp.dao.SchedConfUpdateInfo; @@ -148,14 +149,15 @@ public class ClassSerialisationConfig { AppTimeoutInfo.class, AppTimeoutsInfo.class, BulkActivitiesInfo.class, CapacitySchedulerHealthInfo.class, CapacitySchedulerInfo.class, CapacitySchedulerQueueInfo.class, CapacitySchedulerQueueInfoList.class, ClusterInfo.class, - ClusterMetricsInfo.class, ConfigVersionInfo.class, FairSchedulerQueueInfoList.class, - FifoSchedulerInfo.class, NewReservation.class, NodeInfo.class, NodesInfo.class, - QueueAclInfo.class, QueueAclsInfo.class, RemoteExceptionData.class, - ReservationDeleteRequestInfo.class, ReservationDeleteResponseInfo.class, - ReservationSubmissionRequestInfo.class, ReservationUpdateRequestInfo.class, - ReservationUpdateResponseInfo.class, ResourceInfo.class, ResourceInformationsInfo.class, - SchedulerInfo.class, SchedulerOverviewInfo.class, SchedulerTypeInfo.class, - StatisticsItemInfo.class, UserInfo.class, UserMetricsInfo.class, UsersInfo.class); + ClusterMetricsInfo.class, ConfigVersionInfo.class, ContainerInfo.class, + FairSchedulerQueueInfoList.class, FifoSchedulerInfo.class, NewReservation.class, + NodeInfo.class, NodesInfo.class, QueueAclInfo.class, QueueAclsInfo.class, + RemoteExceptionData.class, ReservationDeleteRequestInfo.class, + ReservationDeleteResponseInfo.class, ReservationSubmissionRequestInfo.class, + ReservationUpdateRequestInfo.class, ReservationUpdateResponseInfo.class, + ResourceInfo.class, ResourceInformationsInfo.class, SchedulerInfo.class, + SchedulerOverviewInfo.class, SchedulerTypeInfo.class, StatisticsItemInfo.class, + UserInfo.class, UserMetricsInfo.class, UsersInfo.class); private static final Set> CONST_UNWRAPPED_CLASSES = Sets.newHashSet(ApplicationSubmissionContextInfo.class, AppPriority.class, AppQueue.class,