From 9dc9ba79217431ec5bac8035ead91cdfa61750f2 Mon Sep 17 00:00:00 2001
From: Hean-Chhinling <heanchhinling@gmail.com>
Date: Tue, 11 Aug 2026 18:01:21 +0200
Subject: [PATCH 1/9] YARN-11981: Utilise leaf-template capacity for the auto
 created queue

---
 .../hooks/useQueueTreeData.ts                 |  12 +-
 .../webapp/src/utils/templateUtils.test.ts    | 137 ++++++++++++++++++
 .../main/webapp/src/utils/templateUtils.ts    |  86 +++++++++++
 3 files changed, 231 insertions(+), 4 deletions(-)
 create mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.test.ts

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
index 7e6b7314e7ceee..a22cbcf7704d1a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
@@ -37,6 +37,7 @@ import {
   QUEUE_CARD_WIDTH,
 } from '~/features/queue-management/constants';
 import type { ValidationIssue } from '~/types';
+import { resolveAutoCreatedQueueCapacityConfigs } from '~/utils/templateUtils';
 
 export type QueueCardData = QueueInfo & {
   stagedStatus?: 'new' | 'modified' | 'deleted';
@@ -249,8 +250,11 @@ function getAutoCreationStatus(
 function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]): QueueCardData {
   const getQueuePropertyValue = useSchedulerStore.getState().getQueuePropertyValue;
 
-  const capacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'capacity');
-  const maxCapacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'maximum-capacity');
+  const { capacityConfig, maxCapacityConfig } = resolveAutoCreatedQueueCapacityConfigs(
+    queueInfo.queuePath,
+    queueInfo.creationMethod,
+    getQueuePropertyValue,
+  );
 
   const stateDisplay = getQueuePropertyValue(queueInfo.queuePath, 'state');
 
@@ -292,8 +296,8 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
       !queueInfo.queues?.queue ||
       (Array.isArray(queueInfo.queues.queue) ? queueInfo.queues.queue.length === 0 : false),
 
-    capacityConfig: capacityDisplay.value || '0',
-    maxCapacityConfig: maxCapacityDisplay.value || '100',
+    capacityConfig,
+    maxCapacityConfig,
 
     stagedState: stateDisplay.isStaged ? stateDisplay.value : undefined,
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.test.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.test.ts
new file mode 100644
index 00000000000000..b620744e52508c
--- /dev/null
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.test.ts
@@ -0,0 +1,137 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { describe, expect, it } from 'vitest';
+
+import { AUTO_CREATION_PROPS } from '~/types/constants/auto-creation';
+
+import {
+  getAutoCreatedQueueTemplatePath,
+  resolveAutoCreatedQueueCapacityConfigs,
+  TEMPLATE_SUFFIXES,
+} from './templateUtils';
+
+const createLookup =
+  (config: Record<string, Record<string, string>>) =>
+  (queuePath: string, property: string) => ({
+    value: config[queuePath]?.[property] ?? '',
+    isStaged: false,
+  });
+
+describe('templateUtils auto-created queue capacity', () => {
+  describe('getAutoCreatedQueueTemplatePath', () => {
+    it('uses leaf-template when flexible auto-creation v2 is enabled on parent', () => {
+      const getQueuePropertyValue = createLookup({
+        'root.default': {
+          [AUTO_CREATION_PROPS.FLEXIBLE_ENABLED]: 'true',
+        },
+      });
+
+      expect(getAutoCreatedQueueTemplatePath('root.default.user1', getQueuePropertyValue)).toBe(
+        `root.default.${TEMPLATE_SUFFIXES.FLEXIBLE_LEAF}`,
+      );
+    });
+
+    it('uses leaf-queue-template when legacy auto-creation is enabled on parent', () => {
+      const getQueuePropertyValue = createLookup({
+        'root.default': {
+          [AUTO_CREATION_PROPS.LEGACY_ENABLED]: 'true',
+        },
+      });
+
+      expect(getAutoCreatedQueueTemplatePath('root.default.user1', getQueuePropertyValue)).toBe(
+        `root.default.${TEMPLATE_SUFFIXES.LEGACY}`,
+      );
+    });
+
+    it('returns null when neither auto-creation mode is enabled on parent', () => {
+      expect(getAutoCreatedQueueTemplatePath('root.default.user1', createLookup({}))).toBeNull();
+    });
+  });
+
+  describe('resolveAutoCreatedQueueCapacityConfigs', () => {
+    it('uses leaf-template capacity for flexible auto-creation (weight mode)', () => {
+      const getQueuePropertyValue = createLookup({
+        'root.default': {
+          [AUTO_CREATION_PROPS.FLEXIBLE_ENABLED]: 'true',
+        },
+        'root.default.user1': {
+          capacity: '0',
+        },
+        [`root.default.${TEMPLATE_SUFFIXES.FLEXIBLE_LEAF}`]: {
+          capacity: '3w',
+          'maximum-capacity': '100',
+        },
+      });
+
+      const resolved = resolveAutoCreatedQueueCapacityConfigs(
+        'root.default.user1',
+        'dynamicFlexible',
+        getQueuePropertyValue,
+      );
+
+      expect(resolved.capacityConfig).toBe('3w');
+      expect(resolved.maxCapacityConfig).toBe('100');
+    });
+
+    it('uses leaf-queue-template capacity for legacy auto-creation (relative/absolute mode)', () => {
+      const getQueuePropertyValue = createLookup({
+        'root.default': {
+          [AUTO_CREATION_PROPS.LEGACY_ENABLED]: 'true',
+        },
+        'root.default.user1': {
+          capacity: '0',
+        },
+        [`root.default.${TEMPLATE_SUFFIXES.LEGACY}`]: {
+          capacity: '100',
+          'maximum-capacity': '100',
+        },
+        [`root.default.${TEMPLATE_SUFFIXES.FLEXIBLE_LEAF}`]: {
+          capacity: '3w',
+        },
+      });
+
+      const resolved = resolveAutoCreatedQueueCapacityConfigs(
+        'root.default.user1',
+        'dynamicLegacy',
+        getQueuePropertyValue,
+      );
+
+      expect(resolved.capacityConfig).toBe('100');
+      expect(resolved.maxCapacityConfig).toBe('100');
+    });
+
+    it('keeps configured capacity for static queues', () => {
+      const getQueuePropertyValue = createLookup({
+        'root.default': {
+          capacity: '25',
+          'maximum-capacity': '100',
+        },
+      });
+
+      const resolved = resolveAutoCreatedQueueCapacityConfigs(
+        'root.default',
+        'static',
+        getQueuePropertyValue,
+      );
+
+      expect(resolved.capacityConfig).toBe('25');
+      expect(resolved.maxCapacityConfig).toBe('100');
+    });
+  });
+});
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.ts
index a799b4b6fd81ba..9083d7230690ab 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.ts
@@ -17,6 +17,10 @@
  */
 
 
+import { getParentQueuePath } from '~/utils/propertyUtils';
+import type { QueueCreationMethod } from '~/types/queue';
+import { AUTO_CREATION_PROPS } from '~/types/constants/auto-creation';
+
 /**
  * Utilities for working with auto-created queue templates
  */
@@ -45,3 +49,85 @@ export function isTemplateQueuePath(queuePath: string): boolean {
     queuePath.includes(marker),
   );
 }
+
+export type QueuePropertyLookup = (
+  queuePath: string,
+  property: string,
+) => {
+  value: string;
+  isStaged: boolean;
+};
+
+export type ResolvedQueueCapacityConfig = {
+  capacityConfig: string;
+  maxCapacityConfig: string;
+};
+
+const isAutoCreationEnabled = (
+  getQueuePropertyValue: QueuePropertyLookup,
+  queuePath: string,
+  property: string,
+): boolean => getQueuePropertyValue(queuePath, property).value.trim() === 'true';
+
+/**
+ * Resolves the template queue path for an auto-created child queue based on the
+ * parent's auto-creation settings:
+ * - flexible v2 (`auto-queue-creation-v2.enabled`) → leaf-template
+ * - legacy (`auto-create-child-queue.enabled`) → leaf-queue-template
+ */
+export function getAutoCreatedQueueTemplatePath(
+  queuePath: string,
+  getQueuePropertyValue: QueuePropertyLookup,
+): string | null {
+  const parentPath = getParentQueuePath(queuePath);
+  if (!parentPath) {
+    return null;
+  }
+
+  if (isAutoCreationEnabled(getQueuePropertyValue, parentPath, AUTO_CREATION_PROPS.FLEXIBLE_ENABLED)) {
+    return `${parentPath}.${TEMPLATE_SUFFIXES.FLEXIBLE_LEAF}`;
+  }
+
+  if (isAutoCreationEnabled(getQueuePropertyValue, parentPath, AUTO_CREATION_PROPS.LEGACY_ENABLED)) {
+    return `${parentPath}.${TEMPLATE_SUFFIXES.LEGACY}`;
+  }
+
+  return null;
+}
+
+export function resolveAutoCreatedQueueCapacityConfigs(
+  queuePath: string,
+  creationMethod: QueueCreationMethod | undefined,
+  getQueuePropertyValue: QueuePropertyLookup,
+  defaults: { capacity: string; maxCapacity: string } = { capacity: '0', maxCapacity: '100' },
+): ResolvedQueueCapacityConfig {
+  const capacityDisplay = getQueuePropertyValue(queuePath, 'capacity');
+  const maxCapacityDisplay = getQueuePropertyValue(queuePath, 'maximum-capacity');
+
+  let capacityConfig = capacityDisplay.value || defaults.capacity;
+  let maxCapacityConfig = maxCapacityDisplay.value || defaults.maxCapacity;
+
+  const isAutoCreatedQueue =
+    creationMethod === 'dynamicLegacy' || creationMethod === 'dynamicFlexible';
+
+  if (!isAutoCreatedQueue) {
+    return { capacityConfig, maxCapacityConfig };
+  }
+
+  const templatePath = getAutoCreatedQueueTemplatePath(queuePath, getQueuePropertyValue);
+  if (!templatePath) {
+    return { capacityConfig, maxCapacityConfig };
+  }
+
+  const templateCapacity = getQueuePropertyValue(templatePath, 'capacity');
+  if (templateCapacity.value.trim()) {
+    capacityConfig = templateCapacity.value.trim();
+  }
+
+  const templateMaxCapacity = getQueuePropertyValue(templatePath, 'maximum-capacity');
+  if (templateMaxCapacity.value.trim()) {
+    maxCapacityConfig = templateMaxCapacity.value.trim();
+  }
+
+  return { capacityConfig, maxCapacityConfig };
+}

From f5d6319823bc5e5aca67c68ed45821ed2d9e4149 Mon Sep 17 00:00:00 2001
From: Hean-Chhinling <heanchhinling@gmail.com>
Date: Wed, 19 Aug 2026 18:37:37 +0200
Subject: [PATCH 2/9] YARN-11981: Utilise existing queueInfo to display
 capacity for auto queue creation

---
 .../hooks/useQueueTreeData.ts                 |  46 +++++-
 .../src/main/webapp/src/types/queue.ts        |   3 +-
 .../webapp/src/utils/templateUtils.test.ts    | 137 ------------------
 .../main/webapp/src/utils/templateUtils.ts    |  86 -----------
 4 files changed, 42 insertions(+), 230 deletions(-)
 delete mode 100644 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.test.ts

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
index a22cbcf7704d1a..44e22f46554a3a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
@@ -37,7 +37,6 @@ import {
   QUEUE_CARD_WIDTH,
 } from '~/features/queue-management/constants';
 import type { ValidationIssue } from '~/types';
-import { resolveAutoCreatedQueueCapacityConfigs } from '~/utils/templateUtils';
 
 export type QueueCardData = QueueInfo & {
   stagedStatus?: 'new' | 'modified' | 'deleted';
@@ -250,11 +249,46 @@ function getAutoCreationStatus(
 function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]): QueueCardData {
   const getQueuePropertyValue = useSchedulerStore.getState().getQueuePropertyValue;
 
-  const { capacityConfig, maxCapacityConfig } = resolveAutoCreatedQueueCapacityConfigs(
-    queueInfo.queuePath,
-    queueInfo.creationMethod,
-    getQueuePropertyValue,
-  );
+  const capacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'capacity');
+  const maxCapacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'maximum-capacity');
+
+  let capacityConfig = capacityDisplay.value || '0';
+  let maxCapacityConfig = maxCapacityDisplay.value || '100';
+
+  const isAutoCreatedQueue =
+    queueInfo.creationMethod === 'dynamicLegacy' ||
+    queueInfo.creationMethod === 'dynamicFlexible';
+
+  if (isAutoCreatedQueue) {
+    const resourcePartitions = queueInfo.capacities?.queueCapacitiesByPartition;
+    const defaultResourcePartition = resourcePartitions?.length
+      ? (resourcePartitions.find((entry) => !entry.partitionName) ?? resourcePartitions[0])
+      : undefined;
+
+    if (capacityDisplay.isStaged) {
+      // Pending local edit from Edit Capacity — not yet applied to the cluster.
+      capacityConfig = capacityDisplay.value;
+    } else {
+      const configuredWeight = queueInfo.weight ?? defaultResourcePartition?.weight;
+      if (configuredWeight !== undefined && configuredWeight > 0) {
+        capacityConfig = `${configuredWeight}w`;
+      } else {
+        const configuredCapacity =
+          queueInfo.capacity ?? defaultResourcePartition?.capacity ?? 0;
+        if (configuredCapacity > 0) {
+          capacityConfig = String(configuredCapacity);
+        }
+      }
+    }
+
+    if (maxCapacityDisplay.isStaged) {
+      maxCapacityConfig = maxCapacityDisplay.value;
+    } else {
+      const configuredMaxCapacity =
+        queueInfo.maxCapacity ?? defaultResourcePartition?.maxCapacity ?? 100;
+      maxCapacityConfig = String(configuredMaxCapacity);
+    }
+  }
 
   const stateDisplay = getQueuePropertyValue(queueInfo.queuePath, 'state');
 
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..b518787f5d2a0e 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
@@ -104,9 +104,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/utils/templateUtils.test.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.test.ts
deleted file mode 100644
index b620744e52508c..00000000000000
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.test.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { describe, expect, it } from 'vitest';
-
-import { AUTO_CREATION_PROPS } from '~/types/constants/auto-creation';
-
-import {
-  getAutoCreatedQueueTemplatePath,
-  resolveAutoCreatedQueueCapacityConfigs,
-  TEMPLATE_SUFFIXES,
-} from './templateUtils';
-
-const createLookup =
-  (config: Record<string, Record<string, string>>) =>
-  (queuePath: string, property: string) => ({
-    value: config[queuePath]?.[property] ?? '',
-    isStaged: false,
-  });
-
-describe('templateUtils auto-created queue capacity', () => {
-  describe('getAutoCreatedQueueTemplatePath', () => {
-    it('uses leaf-template when flexible auto-creation v2 is enabled on parent', () => {
-      const getQueuePropertyValue = createLookup({
-        'root.default': {
-          [AUTO_CREATION_PROPS.FLEXIBLE_ENABLED]: 'true',
-        },
-      });
-
-      expect(getAutoCreatedQueueTemplatePath('root.default.user1', getQueuePropertyValue)).toBe(
-        `root.default.${TEMPLATE_SUFFIXES.FLEXIBLE_LEAF}`,
-      );
-    });
-
-    it('uses leaf-queue-template when legacy auto-creation is enabled on parent', () => {
-      const getQueuePropertyValue = createLookup({
-        'root.default': {
-          [AUTO_CREATION_PROPS.LEGACY_ENABLED]: 'true',
-        },
-      });
-
-      expect(getAutoCreatedQueueTemplatePath('root.default.user1', getQueuePropertyValue)).toBe(
-        `root.default.${TEMPLATE_SUFFIXES.LEGACY}`,
-      );
-    });
-
-    it('returns null when neither auto-creation mode is enabled on parent', () => {
-      expect(getAutoCreatedQueueTemplatePath('root.default.user1', createLookup({}))).toBeNull();
-    });
-  });
-
-  describe('resolveAutoCreatedQueueCapacityConfigs', () => {
-    it('uses leaf-template capacity for flexible auto-creation (weight mode)', () => {
-      const getQueuePropertyValue = createLookup({
-        'root.default': {
-          [AUTO_CREATION_PROPS.FLEXIBLE_ENABLED]: 'true',
-        },
-        'root.default.user1': {
-          capacity: '0',
-        },
-        [`root.default.${TEMPLATE_SUFFIXES.FLEXIBLE_LEAF}`]: {
-          capacity: '3w',
-          'maximum-capacity': '100',
-        },
-      });
-
-      const resolved = resolveAutoCreatedQueueCapacityConfigs(
-        'root.default.user1',
-        'dynamicFlexible',
-        getQueuePropertyValue,
-      );
-
-      expect(resolved.capacityConfig).toBe('3w');
-      expect(resolved.maxCapacityConfig).toBe('100');
-    });
-
-    it('uses leaf-queue-template capacity for legacy auto-creation (relative/absolute mode)', () => {
-      const getQueuePropertyValue = createLookup({
-        'root.default': {
-          [AUTO_CREATION_PROPS.LEGACY_ENABLED]: 'true',
-        },
-        'root.default.user1': {
-          capacity: '0',
-        },
-        [`root.default.${TEMPLATE_SUFFIXES.LEGACY}`]: {
-          capacity: '100',
-          'maximum-capacity': '100',
-        },
-        [`root.default.${TEMPLATE_SUFFIXES.FLEXIBLE_LEAF}`]: {
-          capacity: '3w',
-        },
-      });
-
-      const resolved = resolveAutoCreatedQueueCapacityConfigs(
-        'root.default.user1',
-        'dynamicLegacy',
-        getQueuePropertyValue,
-      );
-
-      expect(resolved.capacityConfig).toBe('100');
-      expect(resolved.maxCapacityConfig).toBe('100');
-    });
-
-    it('keeps configured capacity for static queues', () => {
-      const getQueuePropertyValue = createLookup({
-        'root.default': {
-          capacity: '25',
-          'maximum-capacity': '100',
-        },
-      });
-
-      const resolved = resolveAutoCreatedQueueCapacityConfigs(
-        'root.default',
-        'static',
-        getQueuePropertyValue,
-      );
-
-      expect(resolved.capacityConfig).toBe('25');
-      expect(resolved.maxCapacityConfig).toBe('100');
-    });
-  });
-});
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.ts
index 9083d7230690ab..a799b4b6fd81ba 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/utils/templateUtils.ts
@@ -17,10 +17,6 @@
  */
 
 
-import { getParentQueuePath } from '~/utils/propertyUtils';
-import type { QueueCreationMethod } from '~/types/queue';
-import { AUTO_CREATION_PROPS } from '~/types/constants/auto-creation';
-
 /**
  * Utilities for working with auto-created queue templates
  */
@@ -49,85 +45,3 @@ export function isTemplateQueuePath(queuePath: string): boolean {
     queuePath.includes(marker),
   );
 }
-
-export type QueuePropertyLookup = (
-  queuePath: string,
-  property: string,
-) => {
-  value: string;
-  isStaged: boolean;
-};
-
-export type ResolvedQueueCapacityConfig = {
-  capacityConfig: string;
-  maxCapacityConfig: string;
-};
-
-const isAutoCreationEnabled = (
-  getQueuePropertyValue: QueuePropertyLookup,
-  queuePath: string,
-  property: string,
-): boolean => getQueuePropertyValue(queuePath, property).value.trim() === 'true';
-
-/**
- * Resolves the template queue path for an auto-created child queue based on the
- * parent's auto-creation settings:
- * - flexible v2 (`auto-queue-creation-v2.enabled`) → leaf-template
- * - legacy (`auto-create-child-queue.enabled`) → leaf-queue-template
- */
-export function getAutoCreatedQueueTemplatePath(
-  queuePath: string,
-  getQueuePropertyValue: QueuePropertyLookup,
-): string | null {
-  const parentPath = getParentQueuePath(queuePath);
-  if (!parentPath) {
-    return null;
-  }
-
-  if (isAutoCreationEnabled(getQueuePropertyValue, parentPath, AUTO_CREATION_PROPS.FLEXIBLE_ENABLED)) {
-    return `${parentPath}.${TEMPLATE_SUFFIXES.FLEXIBLE_LEAF}`;
-  }
-
-  if (isAutoCreationEnabled(getQueuePropertyValue, parentPath, AUTO_CREATION_PROPS.LEGACY_ENABLED)) {
-    return `${parentPath}.${TEMPLATE_SUFFIXES.LEGACY}`;
-  }
-
-  return null;
-}
-
-export function resolveAutoCreatedQueueCapacityConfigs(
-  queuePath: string,
-  creationMethod: QueueCreationMethod | undefined,
-  getQueuePropertyValue: QueuePropertyLookup,
-  defaults: { capacity: string; maxCapacity: string } = { capacity: '0', maxCapacity: '100' },
-): ResolvedQueueCapacityConfig {
-  const capacityDisplay = getQueuePropertyValue(queuePath, 'capacity');
-  const maxCapacityDisplay = getQueuePropertyValue(queuePath, 'maximum-capacity');
-
-  let capacityConfig = capacityDisplay.value || defaults.capacity;
-  let maxCapacityConfig = maxCapacityDisplay.value || defaults.maxCapacity;
-
-  const isAutoCreatedQueue =
-    creationMethod === 'dynamicLegacy' || creationMethod === 'dynamicFlexible';
-
-  if (!isAutoCreatedQueue) {
-    return { capacityConfig, maxCapacityConfig };
-  }
-
-  const templatePath = getAutoCreatedQueueTemplatePath(queuePath, getQueuePropertyValue);
-  if (!templatePath) {
-    return { capacityConfig, maxCapacityConfig };
-  }
-
-  const templateCapacity = getQueuePropertyValue(templatePath, 'capacity');
-  if (templateCapacity.value.trim()) {
-    capacityConfig = templateCapacity.value.trim();
-  }
-
-  const templateMaxCapacity = getQueuePropertyValue(templatePath, 'maximum-capacity');
-  if (templateMaxCapacity.value.trim()) {
-    maxCapacityConfig = templateMaxCapacity.value.trim();
-  }
-
-  return { capacityConfig, maxCapacityConfig };
-}

From e00cc5b2dc8591ad2dace9ba636832f5f294611b Mon Sep 17 00:00:00 2001
From: Hean-Chhinling <heanchhinling@gmail.com>
Date: Wed, 19 Aug 2026 19:00:58 +0200
Subject: [PATCH 3/9] YARN-11981: Clean up code

---
 .../queue-management/hooks/useQueueTreeData.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
index 44e22f46554a3a..b3b103e6662665 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
@@ -252,8 +252,8 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
   const capacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'capacity');
   const maxCapacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'maximum-capacity');
 
-  let capacityConfig = capacityDisplay.value || '0';
-  let maxCapacityConfig = maxCapacityDisplay.value || '100';
+  let capacityConfig = capacityDisplay.value;
+  let maxCapacityConfig = maxCapacityDisplay.value;
 
   const isAutoCreatedQueue =
     queueInfo.creationMethod === 'dynamicLegacy' ||
@@ -285,8 +285,10 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
       maxCapacityConfig = maxCapacityDisplay.value;
     } else {
       const configuredMaxCapacity =
-        queueInfo.maxCapacity ?? defaultResourcePartition?.maxCapacity ?? 100;
-      maxCapacityConfig = String(configuredMaxCapacity);
+        queueInfo.maxCapacity ?? defaultResourcePartition?.maxCapacity;
+      if (configuredMaxCapacity !== undefined) {
+        maxCapacityConfig = String(configuredMaxCapacity);
+      }
     }
   }
 
@@ -330,8 +332,8 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
       !queueInfo.queues?.queue ||
       (Array.isArray(queueInfo.queues.queue) ? queueInfo.queues.queue.length === 0 : false),
 
-    capacityConfig,
-    maxCapacityConfig,
+    capacityConfig: capacityConfig || '0',
+    maxCapacityConfig: maxCapacityConfig || '100',
 
     stagedState: stateDisplay.isStaged ? stateDisplay.value : undefined,
 
@@ -342,9 +344,7 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
       queueInfo.autoCreationEligibility,
       stagedChanges,
     ),
-    isAutoCreatedQueue:
-      queueInfo.creationMethod === 'dynamicLegacy' ||
-      queueInfo.creationMethod === 'dynamicFlexible',
+    isAutoCreatedQueue,
 
     validationErrors: directErrors.length > 0 ? directErrors : undefined,
     isAffectedByErrors,

From 4d8b820e1fd249f51e2831f7384868e4508eeea8 Mon Sep 17 00:00:00 2001
From: Hean-Chhinling <heanchhinling@gmail.com>
Date: Mon, 24 Aug 2026 17:56:52 +0200
Subject: [PATCH 4/9] YARN-11981: Handle Absolute Mode auto created queues as
 well

---
 .../hooks/useQueueTreeData.ts                 | 52 +++++++++++--------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
index b3b103e6662665..68bb6b4e0fdfb1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
@@ -247,7 +247,7 @@ function getAutoCreationStatus(
 }
 
 function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]): QueueCardData {
-  const getQueuePropertyValue = useSchedulerStore.getState().getQueuePropertyValue;
+  const { getQueuePropertyValue, getQueuePartitionCapacities } = useSchedulerStore.getState();
 
   const capacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'capacity');
   const maxCapacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'maximum-capacity');
@@ -257,36 +257,44 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
 
   const isAutoCreatedQueue =
     queueInfo.creationMethod === 'dynamicLegacy' ||
-    queueInfo.creationMethod === 'dynamicFlexible';
+    queueInfo.creationMethod === 'dynamicFlexible' ||
+    (queueInfo as { isAutoCreatedLeafQueue?: boolean }).isAutoCreatedLeafQueue === true;
 
   if (isAutoCreatedQueue) {
-    const resourcePartitions = queueInfo.capacities?.queueCapacitiesByPartition;
-    const defaultResourcePartition = resourcePartitions?.length
-      ? (resourcePartitions.find((entry) => !entry.partitionName) ?? resourcePartitions[0])
-      : undefined;
-
-    if (capacityDisplay.isStaged) {
-      // Pending local edit from Edit Capacity — not yet applied to the cluster.
-      capacityConfig = capacityDisplay.value;
-    } else {
+    const defaultResourcePartition =
+      getQueuePartitionCapacities(queueInfo.queuePath, '') ??
+      queueInfo.capacities?.queueCapacitiesByPartition?.find((entry) => !entry.partitionName) ??
+      queueInfo.capacities?.queueCapacitiesByPartition?.[0];
+    const configuredMinResource = defaultResourcePartition?.configuredMinResource;
+
+    if (!capacityDisplay.isStaged) {
       const configuredWeight = queueInfo.weight ?? defaultResourcePartition?.weight;
+      const configuredCapacity =
+        queueInfo.capacity ?? defaultResourcePartition?.capacity ?? 0;
+
       if (configuredWeight !== undefined && configuredWeight > 0) {
         capacityConfig = `${configuredWeight}w`;
-      } else {
-        const configuredCapacity =
-          queueInfo.capacity ?? defaultResourcePartition?.capacity ?? 0;
-        if (configuredCapacity > 0) {
-          capacityConfig = String(configuredCapacity);
-        }
+      } else if (
+        configuredMinResource &&
+        (configuredMinResource.memory > 0 || configuredMinResource.vCores > 0)
+      ) {
+        capacityConfig = `[memory-mb=${configuredMinResource.memory},vcores=${configuredMinResource.vCores}]`;
+      } else if (configuredCapacity > 0) {
+        capacityConfig = String(configuredCapacity);
       }
     }
 
-    if (maxCapacityDisplay.isStaged) {
-      maxCapacityConfig = maxCapacityDisplay.value;
-    } else {
+    if (!maxCapacityDisplay.isStaged) {
       const configuredMaxCapacity =
-        queueInfo.maxCapacity ?? defaultResourcePartition?.maxCapacity;
-      if (configuredMaxCapacity !== undefined) {
+        queueInfo.maxCapacity ?? defaultResourcePartition?.maxCapacity ?? 0;
+      const configuredMaxResource = defaultResourcePartition?.configuredMaxResource;
+
+      if (
+        configuredMaxResource &&
+        (configuredMaxResource.memory > 0 || configuredMaxResource.vCores > 0)
+      ) {
+        maxCapacityConfig = `[memory-mb=${configuredMaxResource.memory},vcores=${configuredMaxResource.vCores}]`;
+      } else if (configuredMaxCapacity > 0) {
         maxCapacityConfig = String(configuredMaxCapacity);
       }
     }

From a2cbf38b8f1dc20527a9841732f09c149f847528 Mon Sep 17 00:00:00 2001
From: Hean-Chhinling <heanchhinling@gmail.com>
Date: Tue, 25 Aug 2026 12:11:53 +0200
Subject: [PATCH 5/9] YARN-11981: Remove safety net when creationMethod is not
 present

---
 .../src/features/queue-management/hooks/useQueueTreeData.ts    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
index 68bb6b4e0fdfb1..d60f5e16bfe71f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
@@ -257,8 +257,7 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
 
   const isAutoCreatedQueue =
     queueInfo.creationMethod === 'dynamicLegacy' ||
-    queueInfo.creationMethod === 'dynamicFlexible' ||
-    (queueInfo as { isAutoCreatedLeafQueue?: boolean }).isAutoCreatedLeafQueue === true;
+    queueInfo.creationMethod === 'dynamicFlexible';
 
   if (isAutoCreatedQueue) {
     const defaultResourcePartition =

From 62033e26fafa0834e251e516cb033d9d7ceaae70 Mon Sep 17 00:00:00 2001
From: Hean-Chhinling <heanchhinling@gmail.com>
Date: Tue, 25 Aug 2026 15:25:52 +0200
Subject: [PATCH 6/9] YARN-11981: Update to use configuredCapacityVector

---
 .../queue-management/hooks/useQueueTreeData.ts    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
index d60f5e16bfe71f..b55d1892a0a02b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
@@ -260,11 +260,9 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
     queueInfo.creationMethod === 'dynamicFlexible';
 
   if (isAutoCreatedQueue) {
-    const defaultResourcePartition =
-      getQueuePartitionCapacities(queueInfo.queuePath, '') ??
-      queueInfo.capacities?.queueCapacitiesByPartition?.find((entry) => !entry.partitionName) ??
-      queueInfo.capacities?.queueCapacitiesByPartition?.[0];
-    const configuredMinResource = defaultResourcePartition?.configuredMinResource;
+    const defaultResourcePartition = getQueuePartitionCapacities(queueInfo.queuePath, '');
+    const configuredCapacityVector =
+      defaultResourcePartition?.queueCapacityVectorInfo?.configuredCapacityVector;
 
     if (!capacityDisplay.isStaged) {
       const configuredWeight = queueInfo.weight ?? defaultResourcePartition?.weight;
@@ -273,11 +271,8 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
 
       if (configuredWeight !== undefined && configuredWeight > 0) {
         capacityConfig = `${configuredWeight}w`;
-      } else if (
-        configuredMinResource &&
-        (configuredMinResource.memory > 0 || configuredMinResource.vCores > 0)
-      ) {
-        capacityConfig = `[memory-mb=${configuredMinResource.memory},vcores=${configuredMinResource.vCores}]`;
+      } else if (configuredCapacityVector && configuredCapacityVector !== '[]') {
+        capacityConfig = String(configuredCapacityVector);
       } else if (configuredCapacity > 0) {
         capacityConfig = String(configuredCapacity);
       }

From 83ccf7f6b4f44e9f2fde4ba6893dcda2dc9ac043 Mon Sep 17 00:00:00 2001
From: Hean-Chhinling <heanchhinling@gmail.com>
Date: Wed, 26 Aug 2026 13:58:24 +0200
Subject: [PATCH 7/9] YARN-11981: Get the capacity from store folder and add
 max capacity field at backend

---
 .../hooks/useQueueTreeData.ts                 |  41 +--
 .../slices/__tests__/queueDataSlice.test.ts   | 277 +++++++++++++++++-
 .../src/stores/slices/queueDataSlice.ts       |  76 ++++-
 .../src/main/webapp/src/types/queue.ts        |  13 +-
 .../src/main/webapp/src/types/scheduler.ts    |   4 +-
 .../dao/PartitionQueueCapacitiesInfo.java     |  12 +
 .../webapp/dao/QueueCapacitiesInfo.java       |   9 +-
 7 files changed, 387 insertions(+), 45 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
index b55d1892a0a02b..2e2aa6a13f2f54 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
@@ -247,53 +247,18 @@ function getAutoCreationStatus(
 }
 
 function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]): QueueCardData {
-  const { getQueuePropertyValue, getQueuePartitionCapacities } = useSchedulerStore.getState();
+  const getQueuePropertyValue = useSchedulerStore.getState().getQueuePropertyValue;
 
   const capacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'capacity');
   const maxCapacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'maximum-capacity');
 
-  let capacityConfig = capacityDisplay.value;
-  let maxCapacityConfig = maxCapacityDisplay.value;
+  const capacityConfig = capacityDisplay.value;
+  const maxCapacityConfig = maxCapacityDisplay.value;
 
   const isAutoCreatedQueue =
     queueInfo.creationMethod === 'dynamicLegacy' ||
     queueInfo.creationMethod === 'dynamicFlexible';
 
-  if (isAutoCreatedQueue) {
-    const defaultResourcePartition = getQueuePartitionCapacities(queueInfo.queuePath, '');
-    const configuredCapacityVector =
-      defaultResourcePartition?.queueCapacityVectorInfo?.configuredCapacityVector;
-
-    if (!capacityDisplay.isStaged) {
-      const configuredWeight = queueInfo.weight ?? defaultResourcePartition?.weight;
-      const configuredCapacity =
-        queueInfo.capacity ?? defaultResourcePartition?.capacity ?? 0;
-
-      if (configuredWeight !== undefined && configuredWeight > 0) {
-        capacityConfig = `${configuredWeight}w`;
-      } else if (configuredCapacityVector && configuredCapacityVector !== '[]') {
-        capacityConfig = String(configuredCapacityVector);
-      } else if (configuredCapacity > 0) {
-        capacityConfig = String(configuredCapacity);
-      }
-    }
-
-    if (!maxCapacityDisplay.isStaged) {
-      const configuredMaxCapacity =
-        queueInfo.maxCapacity ?? defaultResourcePartition?.maxCapacity ?? 0;
-      const configuredMaxResource = defaultResourcePartition?.configuredMaxResource;
-
-      if (
-        configuredMaxResource &&
-        (configuredMaxResource.memory > 0 || configuredMaxResource.vCores > 0)
-      ) {
-        maxCapacityConfig = `[memory-mb=${configuredMaxResource.memory},vcores=${configuredMaxResource.vCores}]`;
-      } else if (configuredMaxCapacity > 0) {
-        maxCapacityConfig = String(configuredMaxCapacity);
-      }
-    }
-  }
-
   const stateDisplay = getQueuePropertyValue(queueInfo.queuePath, 'state');
 
   // Collect validation errors for this queue
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 b518787f5d2a0e..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<string, unknown>;
+  queueCapacityVectorInfo?: QueueCapacityVectorInfo;
+  maximumQueueCapacityVectorInfo?: QueueCapacityVectorInfo;
 };
 
 export type QueueInfo = {
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,

From 60cf053940aee391f92396d81dbfb8220374adfe Mon Sep 17 00:00:00 2001
From: Hean-Chhinling <heanchhinling@gmail.com>
Date: Wed, 26 Aug 2026 17:45:30 +0200
Subject: [PATCH 8/9] YARN-11981: Revert all changes in useQueueTreeData

---
 .../queue-management/hooks/useQueueTreeData.ts    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
index 2e2aa6a13f2f54..7e6b7314e7ceee 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/hooks/useQueueTreeData.ts
@@ -252,13 +252,6 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
   const capacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'capacity');
   const maxCapacityDisplay = getQueuePropertyValue(queueInfo.queuePath, 'maximum-capacity');
 
-  const capacityConfig = capacityDisplay.value;
-  const maxCapacityConfig = maxCapacityDisplay.value;
-
-  const isAutoCreatedQueue =
-    queueInfo.creationMethod === 'dynamicLegacy' ||
-    queueInfo.creationMethod === 'dynamicFlexible';
-
   const stateDisplay = getQueuePropertyValue(queueInfo.queuePath, 'state');
 
   // Collect validation errors for this queue
@@ -299,8 +292,8 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
       !queueInfo.queues?.queue ||
       (Array.isArray(queueInfo.queues.queue) ? queueInfo.queues.queue.length === 0 : false),
 
-    capacityConfig: capacityConfig || '0',
-    maxCapacityConfig: maxCapacityConfig || '100',
+    capacityConfig: capacityDisplay.value || '0',
+    maxCapacityConfig: maxCapacityDisplay.value || '100',
 
     stagedState: stateDisplay.isStaged ? stateDisplay.value : undefined,
 
@@ -311,7 +304,9 @@ function transformToCardData(queueInfo: QueueInfo, stagedChanges: StagedChange[]
       queueInfo.autoCreationEligibility,
       stagedChanges,
     ),
-    isAutoCreatedQueue,
+    isAutoCreatedQueue:
+      queueInfo.creationMethod === 'dynamicLegacy' ||
+      queueInfo.creationMethod === 'dynamicFlexible',
 
     validationErrors: directErrors.length > 0 ? directErrors : undefined,
     isAffectedByErrors,

From 8ec882336a687582e61cb83d7e4d54a475792cfb Mon Sep 17 00:00:00 2001
From: Hean-Chhinling <heanchhinling@gmail.com>
Date: Thu, 27 Aug 2026 12:06:38 +0200
Subject: [PATCH 9/9] YARN-11981: Fix unit-test failure by generate a new
 expecteed RestAPI format to include the new maximumQueueCapacityVectorInfo
 field

---
 ...ation-absolute-hierarchy-after-update.json |  50 +++++
 ...tion-absolute-hierarchy-before-update.json |  50 +++++
 ...bsolute-hierarchy-legacy-after-update.json |  50 +++++
 ...solute-hierarchy-legacy-before-update.json |  50 +++++
 .../webapp/dynamic-testAbsoluteMode-0.json    |  70 +++++++
 .../webapp/dynamic-testAbsoluteMode-16.json   |  70 +++++++
 .../webapp/dynamic-testAbsoluteMode-32.json   |  70 +++++++
 .../dynamic-testAbsoluteMode-legacy-0.json    |  70 +++++++
 .../webapp/dynamic-testPercentageMode-0.json  |  70 +++++++
 .../webapp/dynamic-testPercentageMode-16.json |  70 +++++++
 .../webapp/dynamic-testPercentageMode-32.json |  70 +++++++
 .../dynamic-testPercentageMode-legacy-0.json  |  70 +++++++
 .../webapp/dynamic-testWeightMode-0.json      |  70 +++++++
 .../webapp/dynamic-testWeightMode-16.json     |  70 +++++++
 .../webapp/dynamic-testWeightMode-32.json     |  70 +++++++
 .../dynamic-testWeightMode-after-aqc.json     | 190 ++++++++++++++++++
 .../dynamic-testWeightMode-before-aqc.json    |  70 +++++++
 .../dynamic-testWeightMode-legacy-0.json      |  70 +++++++
 .../dynamic-testWeightMode-legacy-16.json     |  70 +++++++
 .../dynamic-testWeightMode-legacy-32.json     |  70 +++++++
 ...namic-testWeightMode-legacy-after-aqc.json | 190 ++++++++++++++++++
 ...amic-testWeightMode-legacy-before-aqc.json |  70 +++++++
 ...-testSchedulerAbsoluteAndPercentage-0.json |  70 +++++++
 ...testSchedulerAbsoluteAndPercentage-16.json |  70 +++++++
 ...testSchedulerAbsoluteAndPercentage-32.json |  70 +++++++
 ...dulerAbsoluteAndPercentageAndWeight-0.json |  70 +++++++
 ...ulerAbsoluteAndPercentageAndWeight-16.json |  70 +++++++
 ...ulerAbsoluteAndPercentageAndWeight-32.json |  70 +++++++
 ...AbsoluteAndPercentageAndWeightMixed-0.json |  70 +++++++
 ...bsoluteAndPercentageAndWeightMixed-16.json |  70 +++++++
 ...bsoluteAndPercentageAndWeightMixed-32.json |  70 +++++++
 ...ixed-testSchedulerAbsoluteAndWeight-0.json |  70 +++++++
 ...xed-testSchedulerAbsoluteAndWeight-16.json |  70 +++++++
 ...xed-testSchedulerAbsoluteAndWeight-32.json |  70 +++++++
 ...ed-testSchedulerPercentageAndWeight-0.json |  70 +++++++
 ...d-testSchedulerPercentageAndWeight-16.json |  70 +++++++
 ...d-testSchedulerPercentageAndWeight-32.json |  70 +++++++
 ...sponse-AbsoluteModeLegacyAutoCreation.json |  40 ++++
 ...scheduler-response-NodeLabelDefaultAPI.xml |  47 +++++
 .../scheduler-response-PerUserResources.json  |  43 ++++
 .../scheduler-response-PerUserResources.xml   |  47 +++++
 ...onse-PercentageModeLegacyAutoCreation.json |  30 +++
 .../resources/webapp/scheduler-response.json  |  43 ++++
 .../resources/webapp/scheduler-response.xml   |  47 +++++
 44 files changed, 3047 insertions(+)

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 @@
                 <resourceValue>12.5%</resourceValue>
               </capacityVectorEntries>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[memory-mb=50.0%,vcores=50.0%]</configuredCapacityVector>
+              <capacityVectorEntries>
+                <resourceName>memory-mb</resourceName>
+                <resourceValue>50.0%</resourceValue>
+              </capacityVectorEntries>
+              <capacityVectorEntries>
+                <resourceName>vcores</resourceName>
+                <resourceValue>50.0%</resourceValue>
+              </capacityVectorEntries>
+            </maximumQueueCapacityVectorInfo>
             <capacity>12.5</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>50.0</maxCapacity>
@@ -190,6 +201,9 @@
             <queueCapacityVectorInfo>
               <configuredCapacityVector>[]</configuredCapacityVector>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[]</configuredCapacityVector>
+            </maximumQueueCapacityVectorInfo>
             <capacity>0.0</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>100.0</maxCapacity>
@@ -837,6 +851,17 @@
                 <resourceValue>50.0%</resourceValue>
               </capacityVectorEntries>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[memory-mb=0.0,vcores=0.0]</configuredCapacityVector>
+              <capacityVectorEntries>
+                <resourceName>memory-mb</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+              <capacityVectorEntries>
+                <resourceName>vcores</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+            </maximumQueueCapacityVectorInfo>
             <capacity>50.0</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>100.0</maxCapacity>
@@ -1337,6 +1362,17 @@
                 <resourceValue>37.5%</resourceValue>
               </capacityVectorEntries>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[memory-mb=0.0,vcores=0.0]</configuredCapacityVector>
+              <capacityVectorEntries>
+                <resourceName>memory-mb</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+              <capacityVectorEntries>
+                <resourceName>vcores</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+            </maximumQueueCapacityVectorInfo>
             <capacity>37.5</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>100.0</maxCapacity>
@@ -1794,6 +1830,17 @@
             <resourceValue>100.0%</resourceValue>
           </capacityVectorEntries>
         </queueCapacityVectorInfo>
+        <maximumQueueCapacityVectorInfo>
+          <configuredCapacityVector>[memory-mb=100.0%,vcores=100.0%]</configuredCapacityVector>
+          <capacityVectorEntries>
+            <resourceName>memory-mb</resourceName>
+            <resourceValue>100.0%</resourceValue>
+          </capacityVectorEntries>
+          <capacityVectorEntries>
+            <resourceName>vcores</resourceName>
+            <resourceValue>100.0%</resourceValue>
+          </capacityVectorEntries>
+        </maximumQueueCapacityVectorInfo>
         <capacity>100.0</capacity>
         <usedCapacity>0.0</usedCapacity>
         <maxCapacity>100.0</maxCapacity>
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 @@
                 <resourceValue>12.5%</resourceValue>
               </capacityVectorEntries>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[memory-mb=50.0%,vcores=50.0%]</configuredCapacityVector>
+              <capacityVectorEntries>
+                <resourceName>memory-mb</resourceName>
+                <resourceValue>50.0%</resourceValue>
+              </capacityVectorEntries>
+              <capacityVectorEntries>
+                <resourceName>vcores</resourceName>
+                <resourceValue>50.0%</resourceValue>
+              </capacityVectorEntries>
+            </maximumQueueCapacityVectorInfo>
             <capacity>12.5</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>50.0</maxCapacity>
@@ -190,6 +201,9 @@
             <queueCapacityVectorInfo>
               <configuredCapacityVector>[]</configuredCapacityVector>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[]</configuredCapacityVector>
+            </maximumQueueCapacityVectorInfo>
             <capacity>0.0</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>100.0</maxCapacity>
@@ -1065,6 +1079,17 @@
                 <resourceValue>50.0%</resourceValue>
               </capacityVectorEntries>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[memory-mb=0.0,vcores=0.0]</configuredCapacityVector>
+              <capacityVectorEntries>
+                <resourceName>memory-mb</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+              <capacityVectorEntries>
+                <resourceName>vcores</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+            </maximumQueueCapacityVectorInfo>
             <capacity>50.0</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>100.0</maxCapacity>
@@ -1793,6 +1818,17 @@
                 <resourceValue>37.5%</resourceValue>
               </capacityVectorEntries>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[memory-mb=0.0,vcores=0.0]</configuredCapacityVector>
+              <capacityVectorEntries>
+                <resourceName>memory-mb</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+              <capacityVectorEntries>
+                <resourceName>vcores</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+            </maximumQueueCapacityVectorInfo>
             <capacity>37.5</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>100.0</maxCapacity>
@@ -2249,6 +2285,17 @@
             <resourceValue>100.0%</resourceValue>
           </capacityVectorEntries>
         </queueCapacityVectorInfo>
+        <maximumQueueCapacityVectorInfo>
+          <configuredCapacityVector>[memory-mb=100.0%,vcores=100.0%]</configuredCapacityVector>
+          <capacityVectorEntries>
+            <resourceName>memory-mb</resourceName>
+            <resourceValue>100.0%</resourceValue>
+          </capacityVectorEntries>
+          <capacityVectorEntries>
+            <resourceName>vcores</resourceName>
+            <resourceValue>100.0%</resourceValue>
+          </capacityVectorEntries>
+        </maximumQueueCapacityVectorInfo>
         <capacity>100.0</capacity>
         <usedCapacity>0.0</usedCapacity>
         <maxCapacity>100.0</maxCapacity>
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 @@
                 <resourceValue>12.5%</resourceValue>
               </capacityVectorEntries>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[memory-mb=50.0%,vcores=50.0%]</configuredCapacityVector>
+              <capacityVectorEntries>
+                <resourceName>memory-mb</resourceName>
+                <resourceValue>50.0%</resourceValue>
+              </capacityVectorEntries>
+              <capacityVectorEntries>
+                <resourceName>vcores</resourceName>
+                <resourceValue>50.0%</resourceValue>
+              </capacityVectorEntries>
+            </maximumQueueCapacityVectorInfo>
             <capacity>12.5</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>50.0</maxCapacity>
@@ -190,6 +201,9 @@
             <queueCapacityVectorInfo>
               <configuredCapacityVector>[]</configuredCapacityVector>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[]</configuredCapacityVector>
+            </maximumQueueCapacityVectorInfo>
             <capacity>0.0</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>100.0</maxCapacity>
@@ -836,6 +850,17 @@
                 <resourceValue>50.0%</resourceValue>
               </capacityVectorEntries>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[memory-mb=0.0,vcores=0.0]</configuredCapacityVector>
+              <capacityVectorEntries>
+                <resourceName>memory-mb</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+              <capacityVectorEntries>
+                <resourceName>vcores</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+            </maximumQueueCapacityVectorInfo>
             <capacity>50.0</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>100.0</maxCapacity>
@@ -1335,6 +1360,17 @@
                 <resourceValue>37.5%</resourceValue>
               </capacityVectorEntries>
             </queueCapacityVectorInfo>
+            <maximumQueueCapacityVectorInfo>
+              <configuredCapacityVector>[memory-mb=0.0,vcores=0.0]</configuredCapacityVector>
+              <capacityVectorEntries>
+                <resourceName>memory-mb</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+              <capacityVectorEntries>
+                <resourceName>vcores</resourceName>
+                <resourceValue>0.0</resourceValue>
+              </capacityVectorEntries>
+            </maximumQueueCapacityVectorInfo>
             <capacity>37.5</capacity>
             <usedCapacity>0.0</usedCapacity>
             <maxCapacity>100.0</maxCapacity>
@@ -1791,6 +1827,17 @@
             <resourceValue>100.0%</resourceValue>
           </capacityVectorEntries>
         </queueCapacityVectorInfo>
+        <maximumQueueCapacityVectorInfo>
+          <configuredCapacityVector>[memory-mb=100.0%,vcores=100.0%]</configuredCapacityVector>
+          <capacityVectorEntries>
+            <resourceName>memory-mb</resourceName>
+            <resourceValue>100.0%</resourceValue>
+          </capacityVectorEntries>
+          <capacityVectorEntries>
+            <resourceName>vcores</resourceName>
+            <resourceValue>100.0%</resourceValue>
+          </capacityVectorEntries>
+        </maximumQueueCapacityVectorInfo>
         <capacity>100.0</capacity>
         <usedCapacity>0.0</usedCapacity>
         <maxCapacity>100.0</maxCapacity>