From fbd6e04709fe0866dbba12da118b3668acf5a728 Mon Sep 17 00:00:00 2001
From: zeekling <lingzhaohui@zeekling.cn>
Date: Sat, 9 Nov 2024 22:14:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Capacity=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=BA=90=E7=A0=81=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/apache/hadoop/yarn/util/resource/Resources.java  | 6 ++++++
 .../resourcemanager/scheduler/capacity/ParentQueue.java  | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
index c5e5776391..73b0053371 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java
@@ -232,6 +232,12 @@ public static Resource clone(Resource res) {
     return Resource.newInstance(res);
   }
 
+  /**
+   * lhs = lhs + ths
+   * @param lhs
+   * @param rhs
+   * @return
+   */
   public static Resource addTo(Resource lhs, Resource rhs) {
     int maxLength = ResourceUtils.getNumberOfCountableResourceTypes();
     for (int i = 0; i < maxLength; i++) {
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java
index 061e25dd0b..401e60d126 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/ParentQueue.java
@@ -755,6 +755,15 @@ private boolean canAssign(Resource clusterResource, FiCaSchedulerNode node) {
     return accept;
   }
 
+  /**
+   * 获取子队列的队列限制,计算公式:
+   *   <p>子队列的限制 = min(父队列的可用资源 + 子队列的已使用资源, 子队列的限制)<p/>
+   * @param child
+   * @param clusterResource
+   * @param parentLimits
+   * @param nodePartition
+   * @return
+   */
   private ResourceLimits getResourceLimitsOfChild(CSQueue child,
       Resource clusterResource, Resource parentLimits,
       String nodePartition) {