diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/__tests__/queueDataSlice.test.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/__tests__/queueDataSlice.test.ts index 9822355d3ad73a..34ae1e63f16983 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/__tests__/queueDataSlice.test.ts +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/__tests__/queueDataSlice.test.ts @@ -20,7 +20,8 @@ import { describe, it, expect, beforeEach } from 'vitest'; import { createSchedulerStore } from '~/stores/schedulerStore'; import { YarnApiClient } from '~/lib/api/YarnApiClient'; -import type { QueueInfo, SchedulerInfo } from '~/types'; +import { getCapacityVectorValue } from '~/stores/slices/queueDataSlice'; +import type { CapacitySchedulerInfo, QueueCapacityVectorInfo, QueueCapacitiesByPartition, QueueInfo, SchedulerInfo } from '~/types'; import { SPECIAL_VALUES, CONFIG_PREFIXES } from '~/types'; /** @@ -66,6 +67,60 @@ describe('queueDataSlice', () => { return createSchedulerStore(mockApiClient); }; + const createAutoCreatedQueueSchedulerData = ( + partitionCapacity: QueueCapacitiesByPartition, + ): CapacitySchedulerInfo => ({ + ...createMockSchedulerData(), + type: 'capacityScheduler', + queues: { + queue: [ + { + queueName: 'default', + queuePath: 'root.default', + queueType: 'parent', + capacity: 100, + usedCapacity: 0, + maxCapacity: 100, + absoluteCapacity: 100, + absoluteMaxCapacity: 100, + absoluteUsedCapacity: 0, + numApplications: 0, + numActiveApplications: 0, + numPendingApplications: 0, + state: 'RUNNING', + resourcesUsed: { memory: 0, vCores: 0 }, + creationMethod: 'static', + queues: { + queue: [ + { + queueName: 'user1', + queuePath: 'root.default.user1', + queueType: 'leaf', + capacity: partitionCapacity.capacity, + usedCapacity: partitionCapacity.usedCapacity, + maxCapacity: partitionCapacity.maxCapacity ?? 100, + absoluteCapacity: partitionCapacity.absoluteCapacity, + absoluteMaxCapacity: partitionCapacity.absoluteMaxCapacity, + absoluteUsedCapacity: partitionCapacity.absoluteUsedCapacity, + numApplications: 0, + numActiveApplications: 0, + numPendingApplications: 0, + state: 'RUNNING', + resourcesUsed: { memory: 0, vCores: 0 }, + creationMethod: 'dynamicLegacy', + capacities: { + queueCapacitiesByPartition: [ + { ...partitionCapacity, partitionName: partitionCapacity.partitionName ?? '' }, + ], + }, + }, + ], + }, + }, + ], + }, + }); + const createMockSchedulerData = (): SchedulerInfo => ({ type: 'capacityScheduler', capacity: 100, @@ -287,6 +342,226 @@ describe('queueDataSlice', () => { expect(result.value).toBe(''); expect(result.isStaged).toBe(true); }); + + it('should resolve capacity from scheduler REST vector when queue capacity is missing from scheduler-conf', () => { + const store = createTestStore(); + const schedulerData = createAutoCreatedQueueSchedulerData({ + partitionName: '', + capacity: 6.25, + usedCapacity: 0, + maxCapacity: 100, + absoluteCapacity: 6.25, + absoluteMaxCapacity: 100, + absoluteUsedCapacity: 0, + queueCapacityVectorInfo: { + configuredCapacityVector: '[memory-mb=2048.0,vcores=2.0]', + capacityVectorEntries: [ + { resourceName: 'memory-mb', resourceValue: '2048.0' }, + { resourceName: 'vcores', resourceValue: '2.0' }, + ], + }, + }); + + store.setState({ + configData: new Map(), + stagedChanges: [], + schedulerData, + }); + + const result = store.getState().getQueuePropertyValue('root.default.user1', 'capacity'); + + expect(result.value).toBe('[memory-mb=2048.0,vcores=2.0]'); + expect(result.isStaged).toBe(false); + }); + + it('should resolve maximum-capacity from scheduler REST max vector when queue maximum-capacity is missing from scheduler-conf', () => { + const store = createTestStore(); + const schedulerData = createAutoCreatedQueueSchedulerData({ + partitionName: '', + capacity: 50, + usedCapacity: 0, + maxCapacity: 100, + absoluteCapacity: 50, + absoluteMaxCapacity: 100, + absoluteUsedCapacity: 0, + maximumQueueCapacityVectorInfo: { + configuredCapacityVector: '[memory-mb=4096.0,vcores=4.0w]', + capacityVectorEntries: [ + { resourceName: 'memory-mb', resourceValue: '4096.0' }, + { resourceName: 'vcores', resourceValue: '4.0w' }, + ], + }, + }); + + store.setState({ + configData: new Map(), + stagedChanges: [], + schedulerData, + }); + + const result = store + .getState() + .getQueuePropertyValue('root.default.user1', 'maximum-capacity'); + + expect(result.value).toBe('[memory-mb=4096.0,vcores=4.0w]'); + expect(result.isStaged).toBe(false); + }); + + it('should prefer config store over scheduler REST vectors', () => { + const store = createTestStore(); + const baseSchedulerData = createMockSchedulerData(); + const schedulerData: CapacitySchedulerInfo = { + ...baseSchedulerData, + type: 'capacityScheduler', + queues: { + queue: [ + { + ...(baseSchedulerData.queues!.queue as QueueInfo[])[0], + queuePath: 'root.default', + capacities: { + queueCapacitiesByPartition: [ + { + partitionName: '', + capacity: 40, + usedCapacity: 0, + maxCapacity: 100, + absoluteCapacity: 40, + absoluteMaxCapacity: 100, + absoluteUsedCapacity: 0, + queueCapacityVectorInfo: { + configuredCapacityVector: '[memory-mb=2048.0,vcores=2.0]', + capacityVectorEntries: [ + { resourceName: 'memory-mb', resourceValue: '2048.0' }, + { resourceName: 'vcores', resourceValue: '2.0' }, + ], + }, + }, + ], + }, + }, + ], + }, + }; + + store.setState({ + configData: new Map([['yarn.scheduler.capacity.root.default.capacity', '40']]), + stagedChanges: [], + schedulerData, + }); + + const result = store.getState().getQueuePropertyValue('root.default', 'capacity'); + + expect(result.value).toBe('40'); + expect(result.isStaged).toBe(false); + }); + + it('should simplify uniform percentage vectors to a scalar value', () => { + const store = createTestStore(); + const schedulerData = createAutoCreatedQueueSchedulerData({ + partitionName: '', + capacity: 50, + usedCapacity: 0, + maxCapacity: 100, + absoluteCapacity: 50, + absoluteMaxCapacity: 100, + absoluteUsedCapacity: 0, + queueCapacityVectorInfo: { + configuredCapacityVector: '[memory-mb=50.0%,vcores=50.0%]', + capacityVectorEntries: [ + { resourceName: 'memory-mb', resourceValue: '50.0%' }, + { resourceName: 'vcores', resourceValue: '50.0%' }, + ], + }, + }); + + store.setState({ + configData: new Map(), + stagedChanges: [], + schedulerData, + }); + + const result = store.getState().getQueuePropertyValue('root.default.user1', 'capacity'); + + expect(result.value).toBe('50.0'); + expect(result.isStaged).toBe(false); + }); + + it('should prefer staged changes over scheduler REST vectors', () => { + const store = createTestStore(); + const schedulerData = createAutoCreatedQueueSchedulerData({ + partitionName: '', + capacity: 6.25, + usedCapacity: 0, + maxCapacity: 100, + absoluteCapacity: 6.25, + absoluteMaxCapacity: 100, + absoluteUsedCapacity: 0, + queueCapacityVectorInfo: { + configuredCapacityVector: '[memory-mb=2048.0,vcores=2.0]', + capacityVectorEntries: [ + { resourceName: 'memory-mb', resourceValue: '2048.0' }, + { resourceName: 'vcores', resourceValue: '2.0' }, + ], + }, + }); + + store.setState({ + configData: new Map(), + stagedChanges: [ + { + id: 'change-1', + type: 'update', + queuePath: 'root.default.user1', + property: 'capacity', + newValue: '75', + oldValue: '', + timestamp: Date.now(), + }, + ], + schedulerData, + }); + + const result = store.getState().getQueuePropertyValue('root.default.user1', 'capacity'); + + expect(result.value).toBe('75'); + expect(result.isStaged).toBe(true); + }); + }); + + describe('getCapacityVectorValue', () => { + it('should return empty string for missing or empty vectors', () => { + expect(getCapacityVectorValue(undefined)).toBe(''); + expect( + getCapacityVectorValue({ + configuredCapacityVector: '[]', + capacityVectorEntries: [], + }), + ).toBe(''); + }); + + it('should return the full vector for mixed absolute and weight entries', () => { + const vectorInfo: QueueCapacityVectorInfo = { + configuredCapacityVector: '[memory-mb=4096.0,vcores=4.0w]', + capacityVectorEntries: [ + { resourceName: 'memory-mb', resourceValue: '4096.0' }, + { resourceName: 'vcores', resourceValue: '4.0w' }, + ], + }; + + expect(getCapacityVectorValue(vectorInfo)).toBe('[memory-mb=4096.0,vcores=4.0w]'); + }); + + it('should simplify uniform weight vectors to a weight scalar', () => { + const vectorInfo: QueueCapacityVectorInfo = { + configuredCapacityVector: '[memory-mb=3.0w,vcores=3.0w]', + capacityVectorEntries: [ + { resourceName: 'memory-mb', resourceValue: '3.0w' }, + { resourceName: 'vcores', resourceValue: '3.0w' }, + ], + }; + + expect(getCapacityVectorValue(vectorInfo)).toBe('3.0w'); + }); }); describe('getGlobalPropertyValue', () => { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/queueDataSlice.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/queueDataSlice.ts index 827d6a58b9b97f..c9f7cc0d03e98c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/queueDataSlice.ts +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/queueDataSlice.ts @@ -23,11 +23,60 @@ import type { StateCreator } from 'zustand'; import { SPECIAL_VALUES } from '~/types'; -import type { QueueInfo, CapacitySchedulerInfo, QueueCapacitiesByPartition } from '~/types'; +import type { + QueueInfo, + CapacitySchedulerInfo, + QueueCapacitiesByPartition, + QueueCapacityVectorInfo, +} from '~/types'; import { buildGlobalPropertyKey, buildPropertyKey } from '~/utils/propertyUtils'; import { globalPropertyDefinitions } from '~/config/properties/global-properties'; import type { QueueDataSlice, SchedulerStore } from './types'; +type CapacityProperty = { + partitionName: string; + target: 'capacity' | 'maximum-capacity'; +}; + +const parseCapacityProperty = (property: string): CapacityProperty | null => { + if (property === 'capacity' || property === 'maximum-capacity') { + return { partitionName: '', target: property }; + } + + const labelProperty = property.match( + /^accessible-node-labels\.(.+)\.(capacity|maximum-capacity)$/, + ); + if (!labelProperty) { + return null; + } + + return { + partitionName: labelProperty[1], + target: labelProperty[2] as CapacityProperty['target'], + }; +}; + +export const getCapacityVectorValue = (vectorInfo?: QueueCapacityVectorInfo): string => { + const configuredVector = vectorInfo?.configuredCapacityVector?.trim(); + if (!configuredVector || configuredVector === '[]') { + return ''; + } + + const entries = vectorInfo?.capacityVectorEntries ?? []; + const firstValue = entries[0]?.resourceValue; + const isUniform = firstValue && entries.every((entry) => entry.resourceValue === firstValue); + + if (isUniform && firstValue.endsWith('%')) { + return firstValue.slice(0, -1); + } + + if (isUniform && firstValue.endsWith('w')) { + return firstValue; + } + + return configuredVector; +}; + export const createQueueDataSlice: StateCreator< SchedulerStore, [['zustand/immer', never]], @@ -36,7 +85,7 @@ export const createQueueDataSlice: StateCreator< > = (_set, get) => ({ getQueuePropertyValue: (queuePath, property) => { const propertyKey = buildPropertyKey(queuePath, property); - const configValue = get().configData.get(propertyKey) || ''; + const configValue = get().configData.get(propertyKey); // Check if there's a staged change for this property const stagedChange = get().stagedChanges.find( @@ -47,7 +96,28 @@ export const createQueueDataSlice: StateCreator< return { value: stagedChange.newValue, isStaged: true }; } - return { value: configValue, isStaged: false }; + if (configValue) { + return { value: configValue, isStaged: false }; + } + + const capacityProperty = parseCapacityProperty(property); + if (capacityProperty) { + const partition = get().getQueuePartitionCapacities( + queuePath, + capacityProperty.partitionName, + ); + const vectorInfo = + capacityProperty.target === 'capacity' + ? partition?.queueCapacityVectorInfo + : partition?.maximumQueueCapacityVectorInfo; + const vectorValue = getCapacityVectorValue(vectorInfo); + + if (vectorValue) { + return { value: vectorValue, isStaged: false }; + } + } + + return { value: configValue ?? '', isStaged: false }; }, getGlobalPropertyValue: (property) => { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/types/queue.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/types/queue.ts index 9a7407daf20ca1..99a129fd674e01 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/types/queue.ts +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/types/queue.ts @@ -45,6 +45,16 @@ export type ResourceUsageByPartition = { used?: ResourceInfo; }; +export type QueueCapacityVectorEntryInfo = { + resourceName: string; + resourceValue: string; +}; + +export type QueueCapacityVectorInfo = { + configuredCapacityVector: string; + capacityVectorEntries: QueueCapacityVectorEntryInfo[]; +}; + export type QueueCapacityByPartition = { partitionName: string; capacity?: number; @@ -60,7 +70,8 @@ export type QueueCapacityByPartition = { configuredMinResource?: ResourceInfo; effectiveMaxResource?: ResourceInfo; effectiveMinResource?: ResourceInfo; - queueCapacityVectorInfo?: Record; + queueCapacityVectorInfo?: QueueCapacityVectorInfo; + maximumQueueCapacityVectorInfo?: QueueCapacityVectorInfo; }; export type QueueInfo = { @@ -104,9 +115,10 @@ export type QueueInfo = { numSchedulableApplications?: number; numNonSchedulableApplications?: number; - // Capacity details + // Capacity details (from scheduler REST) maxEffectiveCapacity?: ResourceInfo; minEffectiveCapacity?: ResourceInfo; + weight?: number; normalizedWeight?: number; isAbsoluteResource?: boolean; effectiveMinResource?: ResourceInfo; diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/types/scheduler.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/types/scheduler.ts index 7818d3ae335361..8b1e829495c7da 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/types/scheduler.ts +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/types/scheduler.ts @@ -17,7 +17,7 @@ */ -import type { QueueInfo } from './queue'; +import type { QueueInfo, QueueCapacityVectorInfo } from './queue'; import type { ResourceInfo } from './resource'; export type SchedulerData = { @@ -50,6 +50,8 @@ export type QueueCapacitiesByPartition = { configuredMinResource?: ResourceInfo; effectiveMaxResource?: ResourceInfo; effectiveMinResource?: ResourceInfo; + queueCapacityVectorInfo?: QueueCapacityVectorInfo; + maximumQueueCapacityVectorInfo?: QueueCapacityVectorInfo; maximumAllocation?: ResourceInfo; minimumAllocation?: ResourceInfo; netPending?: ResourceInfo; 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/PartitionQueueCapacitiesInfo.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/PartitionQueueCapacitiesInfo.java index b9ccf0ecb7791c..32ece3061cf99b 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/PartitionQueueCapacitiesInfo.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/PartitionQueueCapacitiesInfo.java @@ -33,6 +33,7 @@ public class PartitionQueueCapacitiesInfo { private String partitionName; private QueueCapacityVectorInfo queueCapacityVectorInfo; + private QueueCapacityVectorInfo maximumQueueCapacityVectorInfo; private float capacity; private float usedCapacity; private float maxCapacity = 100; @@ -52,6 +53,7 @@ public PartitionQueueCapacitiesInfo() { public PartitionQueueCapacitiesInfo(String partitionName, QueueCapacityVectorInfo queueCapacityVectorInfo, + QueueCapacityVectorInfo maximumQueueCapacityVectorInfo, float capacity, float usedCapacity, float maxCapacity, float absCapacity, float absUsedCapacity, float absMaxCapacity, float maxAMLimitPercentage, float weight, float normalizedWeight, @@ -59,6 +61,7 @@ public PartitionQueueCapacitiesInfo(String partitionName, Resource effMaxRes) { super(); this.queueCapacityVectorInfo = queueCapacityVectorInfo; + this.maximumQueueCapacityVectorInfo = maximumQueueCapacityVectorInfo; this.partitionName = partitionName; this.capacity = capacity; this.usedCapacity = usedCapacity; @@ -83,6 +86,15 @@ public void setQueueCapacityVectorInfo(QueueCapacityVectorInfo queueCapacityVect this.queueCapacityVectorInfo = queueCapacityVectorInfo; } + public QueueCapacityVectorInfo getMaximumQueueCapacityVectorInfo() { + return maximumQueueCapacityVectorInfo; + } + + public void setMaximumQueueCapacityVectorInfo( + QueueCapacityVectorInfo maximumQueueCapacityVectorInfo) { + this.maximumQueueCapacityVectorInfo = maximumQueueCapacityVectorInfo; + } + public float getCapacity() { return capacity; } 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/QueueCapacitiesInfo.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/QueueCapacitiesInfo.java index 3f42a626163c13..4ee73da661d7c6 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/QueueCapacitiesInfo.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/QueueCapacitiesInfo.java @@ -48,6 +48,7 @@ public QueueCapacitiesInfo(CSQueue queue, boolean considerAMUsage) { return; } QueueCapacityVectorInfo queueCapacityVectorInfo; + QueueCapacityVectorInfo maximumQueueCapacityVectorInfo; float capacity; float usedCapacity; float maxCapacity; @@ -62,6 +63,11 @@ public QueueCapacitiesInfo(CSQueue queue, boolean considerAMUsage) { queueCapacityVectorInfo = queueCapacityVector == null ? new QueueCapacityVectorInfo(new QueueCapacityVector()) : new QueueCapacityVectorInfo(queue.getConfiguredCapacityVector(partitionName)); + QueueCapacityVector maximumQueueCapacityVector = + queue.getConfiguredMaxCapacityVector(partitionName); + maximumQueueCapacityVectorInfo = maximumQueueCapacityVector == null ? + new QueueCapacityVectorInfo(new QueueCapacityVector()) : + new QueueCapacityVectorInfo(maximumQueueCapacityVector); usedCapacity = capacities.getUsedCapacity(partitionName) * 100; capacity = capacities.getCapacity(partitionName) * 100; maxCapacity = capacities.getMaximumCapacity(partitionName); @@ -79,7 +85,8 @@ public QueueCapacitiesInfo(CSQueue queue, boolean considerAMUsage) { weight = capacities.getWeight(partitionName); normalizedWeight = capacities.getNormalizedWeight(partitionName); queueCapacitiesByPartition.add(new PartitionQueueCapacitiesInfo( - partitionName, queueCapacityVectorInfo, capacity, usedCapacity, maxCapacity, absCapacity, + partitionName, queueCapacityVectorInfo, maximumQueueCapacityVectorInfo, + capacity, usedCapacity, maxCapacity, absCapacity, absUsedCapacity, absMaxCapacity, considerAMUsage ? maxAMLimitPercentage : 0f, weight, normalizedWeight, 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 7444be0c81b907..3bdf2f80fe7411 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 @@ -93,6 +93,16 @@ "resourceValue" : "0.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "0.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -969,6 +989,16 @@ "resourceValue" : "4.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=32768.0,vcores=32.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "32768.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "32.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1273,6 +1303,16 @@ "resourceValue" : "1.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 3.125, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1678,6 +1718,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 2e9bf9d9feee5a..c012afd43b6c92 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 @@ -93,6 +93,16 @@ "resourceValue" : "0.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "0.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -969,6 +989,16 @@ "resourceValue" : "0.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1273,6 +1303,16 @@ "resourceValue" : "1.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 3.125, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1678,6 +1718,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 fbb205aad88882..cd4344d4a7dd8f 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 @@ -93,6 +93,16 @@ "resourceValue" : "0.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "0.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -969,6 +989,16 @@ "resourceValue" : "4.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=32768.0,vcores=32.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "32768.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "32.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1273,6 +1303,16 @@ "resourceValue" : "1.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 3.125, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1678,6 +1718,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 0e597b84b3e87e..a64b5b3c45b33c 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 @@ -93,6 +93,16 @@ "resourceValue" : "0.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "0.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -969,6 +989,16 @@ "resourceValue" : "0.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1273,6 +1303,16 @@ "resourceValue" : "1.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 3.125, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1678,6 +1718,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 7ffe0318dfb77e..fb3eb3c86418b9 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 e3c441463a3703..3649049881237a 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 e7e605ad68e68a..86701ad6f4bae5 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 3cd78a1b7b0f7f..ac18adaea43543 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 7febd328757788..bdea0e2a8e48e8 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 @@ -77,6 +77,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "37.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.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 c1a4eed4cf9be9..0b44f7ed8ca97c 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 @@ -77,6 +77,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "37.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.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 be45d10c04fbf8..4c64883adb7416 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 @@ -77,6 +77,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "37.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 94c7381604c8d7..cd017f38b4a0ae 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 @@ -77,6 +77,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "37.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 12cd0760332331..b1c030bc6c8174 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 3669ab08a262a2..eb8c79b53eb9bd 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 824448edb4a780..c923f637e4b3ac 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 cbbe4fd267cf26..d87bc75ec56a58 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2179,6 +2229,16 @@ "resourceValue" : "10.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 41.666664, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2624,6 +2684,16 @@ "resourceValue" : "10.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 41.666664, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -3085,6 +3155,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -3530,6 +3610,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -3961,6 +4051,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 4.166667, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -4294,6 +4394,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -4725,6 +4835,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 4.166667, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -5053,6 +5173,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -5484,6 +5614,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 4.166667, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -5828,6 +5968,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -6259,6 +6409,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -6557,6 +6717,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 4.166667, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -6855,6 +7025,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -7132,6 +7312,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 2bee584371733d..4127c447b89979 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2440,6 +2500,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 3efd7d26157322..2ac207d90aac24 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 d4cddc63e436fb..82fb1ddb364fe1 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 a793351cdb7142..2121764b698dbe 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 e1a9407652d681..459dd02b605993 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2179,6 +2229,16 @@ "resourceValue" : "10.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2624,6 +2684,16 @@ "resourceValue" : "10.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -3085,6 +3155,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -3530,6 +3610,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -3961,6 +4051,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -4294,6 +4394,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -4725,6 +4835,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -5053,6 +5173,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -5484,6 +5614,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -5828,6 +5968,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -6259,6 +6409,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -6557,6 +6717,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -6855,6 +7025,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -7132,6 +7312,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 ef0a6d5d9e4210..bb55bbcfc45f4c 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2440,6 +2500,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 54354b01a4411a..30f2171227061d 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 @@ -77,6 +77,16 @@ "resourceValue" : "25.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 c23f12b6106c2c..c69b584e95b1fd 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 @@ -77,6 +77,16 @@ "resourceValue" : "25.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 9989542e323437..31b0229aefd41a 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 @@ -77,6 +77,16 @@ "resourceValue" : "25.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 838de2502b966a..e933f1209219de 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 @@ -77,6 +77,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 5ee9cb537884d0..83404432798653 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 @@ -77,6 +77,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 4252e599cd0b6e..66857d1cb8c773 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 @@ -77,6 +77,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 19468b959c7e1a..e78c43ecbcd5ea 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "86.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 5de99c4c64a70b..f8872298115117 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "86.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 d07ba847c10d3b..d76400b0eb0886 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 @@ -77,6 +77,16 @@ "resourceValue" : "4.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "86.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "12.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 08c6c081d406af..c27c9913752973 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 @@ -77,6 +77,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "3.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 7cb2f9082db417..61157d5a21c6ae 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 @@ -77,6 +77,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "3.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 e397a61ea44395..cb948de2bba3f1 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 @@ -77,6 +77,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "16.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "3.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 1c50dfba447478..0026f5cfe40b80 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 @@ -77,6 +77,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "3.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 77d308db817576..0611ab189f31ce 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 @@ -77,6 +77,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "3.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 a9d6b559c8ff0a..a9b4b8fcc35aaa 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 @@ -77,6 +77,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -983,6 +1003,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1428,6 +1458,16 @@ "resourceValue" : "1.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1859,6 +1899,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2163,6 +2213,16 @@ "resourceValue" : "3.0w" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2568,6 +2628,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 1f40c01356bc10..e173baf8573c07 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 @@ -77,6 +77,16 @@ "resourceValue" : "28.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 87.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -538,6 +548,16 @@ "resourceValue" : "2.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -969,6 +989,16 @@ "resourceValue" : "4.0" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1244,6 +1274,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-NodeLabelDefaultAPI.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-NodeLabelDefaultAPI.xml index 4dfa5d9246675c..f537ce53f1ae97 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-NodeLabelDefaultAPI.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-NodeLabelDefaultAPI.xml @@ -79,6 +79,17 @@ 12.5% + + [memory-mb=50.0%,vcores=50.0%] + + memory-mb + 50.0% + + + vcores + 50.0% + + 12.5 0.0 50.0 @@ -190,6 +201,9 @@ [] + + [] + 0.0 0.0 100.0 @@ -837,6 +851,17 @@ 50.0% + + [memory-mb=0.0,vcores=0.0] + + memory-mb + 0.0 + + + vcores + 0.0 + + 50.0 0.0 100.0 @@ -1337,6 +1362,17 @@ 37.5% + + [memory-mb=0.0,vcores=0.0] + + memory-mb + 0.0 + + + vcores + 0.0 + + 37.5 0.0 100.0 @@ -1794,6 +1830,17 @@ 100.0% + + [memory-mb=100.0%,vcores=100.0%] + + memory-mb + 100.0% + + + vcores + 100.0% + + 100.0 0.0 100.0 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 a4935ca3628055..a48a6be64a3a5c 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 @@ -77,6 +77,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "50.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "50.0%" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 50.0, @@ -175,6 +185,9 @@ "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[]" }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[]" + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -950,6 +963,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1597,6 +1620,16 @@ "resourceValue" : "37.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -2002,6 +2035,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.xml index ca4e6901a5c653..7547cd9cce97c8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response-PerUserResources.xml @@ -79,6 +79,17 @@ 12.5% + + [memory-mb=50.0%,vcores=50.0%] + + memory-mb + 50.0% + + + vcores + 50.0% + + 12.5 0.0 50.0 @@ -190,6 +201,9 @@ [] + + [] + 0.0 0.0 100.0 @@ -1065,6 +1079,17 @@ 50.0% + + [memory-mb=0.0,vcores=0.0] + + memory-mb + 0.0 + + + vcores + 0.0 + + 50.0 0.0 100.0 @@ -1793,6 +1818,17 @@ 37.5% + + [memory-mb=0.0,vcores=0.0] + + memory-mb + 0.0 + + + vcores + 0.0 + + 37.5 0.0 100.0 @@ -2249,6 +2285,17 @@ 100.0% + + [memory-mb=100.0%,vcores=100.0%] + + memory-mb + 100.0% + + + vcores + 100.0% + + 100.0 0.0 100.0 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 de49631b86c7a0..50aaff32ec8c70 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 @@ -77,6 +77,16 @@ "resourceValue" : "25.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 25.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -522,6 +532,16 @@ "resourceValue" : "75.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 75.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -786,6 +806,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, 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 c6857b0482e45f..8551d9451ca7a6 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 @@ -77,6 +77,16 @@ "resourceValue" : "12.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=50.0%,vcores=50.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "50.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "50.0%" + } ] + }, "capacity" : 12.5, "usedCapacity" : 0.0, "maxCapacity" : 50.0, @@ -175,6 +185,9 @@ "queueCapacityVectorInfo" : { "configuredCapacityVector" : "[]" }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[]" + }, "capacity" : 0.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -748,6 +761,16 @@ "resourceValue" : "50.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 50.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1193,6 +1216,16 @@ "resourceValue" : "37.5%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=0.0,vcores=0.0]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "0.0" + }, { + "resourceName" : "vcores", + "resourceValue" : "0.0" + } ] + }, "capacity" : 37.5, "usedCapacity" : 0.0, "maxCapacity" : 100.0, @@ -1598,6 +1631,16 @@ "resourceValue" : "100.0%" } ] }, + "maximumQueueCapacityVectorInfo" : { + "configuredCapacityVector" : "[memory-mb=100.0%,vcores=100.0%]", + "capacityVectorEntries" : [ { + "resourceName" : "memory-mb", + "resourceValue" : "100.0%" + }, { + "resourceName" : "vcores", + "resourceValue" : "100.0%" + } ] + }, "capacity" : 100.0, "usedCapacity" : 0.0, "maxCapacity" : 100.0, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.xml index 1742c7a7655361..66353810fc1ffe 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/webapp/scheduler-response.xml @@ -79,6 +79,17 @@ 12.5% + + [memory-mb=50.0%,vcores=50.0%] + + memory-mb + 50.0% + + + vcores + 50.0% + + 12.5 0.0 50.0 @@ -190,6 +201,9 @@ [] + + [] + 0.0 0.0 100.0 @@ -836,6 +850,17 @@ 50.0% + + [memory-mb=0.0,vcores=0.0] + + memory-mb + 0.0 + + + vcores + 0.0 + + 50.0 0.0 100.0 @@ -1335,6 +1360,17 @@ 37.5% + + [memory-mb=0.0,vcores=0.0] + + memory-mb + 0.0 + + + vcores + 0.0 + + 37.5 0.0 100.0 @@ -1791,6 +1827,17 @@ 100.0% + + [memory-mb=100.0%,vcores=100.0%] + + memory-mb + 100.0% + + + vcores + 100.0% + + 100.0 0.0 100.0