(hadoop) branch trunk updated: YARN-11646. Do not ignore zero memory capacity config in QueueCapacityConfigParser. (#6433)

[bteke]

This is an automated email from the ASF dual-hosted git repository.

bteke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 55b9f8769873 YARN-11646. Do not ignore zero memory capacity config in 
QueueCapacityConfigParser. (#6433)
55b9f8769873 is described below

commit 55b9f8769873902987ca40ed37a7f68df6b7bcbf
Author: Tamas Domok <tdo...@cloudera.com>
AuthorDate: Thu Jan 11 13:47:00 2024 +0100

    YARN-11646. Do not ignore zero memory capacity config in 
QueueCapacityConfigParser. (#6433)
---
 .../capacity/conf/QueueCapacityConfigParser.java        |  5 -----
 .../capacity/conf/TestQueueCapacityConfigParser.java    | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/QueueCapacityConfigParser.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/conf/QueueCapacityConfigParser.java
index 79786a11b3cb..644938e33e77 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/conf/QueueCapacityConfigParser.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/conf/QueueCapacityConfigParser.java
@@ -148,11 +148,6 @@ public class QueueCapacityConfigParser {
       }
     }
 
-    // Memory always have to be defined
-    if (capacityVector.getMemory() == 0L) {
-      return new QueueCapacityVector();
-    }
-
     return capacityVector;
   }
 
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestQueueCapacityConfigParser.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestQueueCapacityConfigParser.java
index 4e8f31e1a851..47701484f6a8 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestQueueCapacityConfigParser.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/TestQueueCapacityConfigParser.java
@@ -214,4 +214,19 @@ public class TestQueueCapacityConfigParser {
         Lists.newArrayList(nonSetCapacity.iterator());
     Assert.assertEquals(nonSetResources.size(), 0);
   }
-}
\ No newline at end of file
+
+  @Test
+  public void testZeroAbsoluteCapacityConfig() {
+    QueueCapacityVector weightCapacityVector =
+        capacityConfigParser.parse(String.format(MEMORY_VCORE_TEMPLATE, 0, 0), 
QUEUE);
+
+    QueueCapacityVectorEntry memory = 
weightCapacityVector.getResource(MEMORY_URI);
+    QueueCapacityVectorEntry vcore = 
weightCapacityVector.getResource(VCORES_URI);
+
+    Assert.assertEquals(ResourceUnitCapacityType.ABSOLUTE, 
memory.getVectorResourceType());
+    Assert.assertEquals(0, memory.getResourceValue(), EPSILON);
+
+    Assert.assertEquals(ResourceUnitCapacityType.ABSOLUTE, 
vcore.getVectorResourceType());
+    Assert.assertEquals(0, vcore.getResourceValue(), EPSILON);
+  }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org