Skip to content

Commit 92e475f

Browse files
tomicoolersusheelgupta7
authored andcommitted
YARN-11646. Do not ignore zero memory capacity config in QueueCapacityConfigParser. (#6433)
1 parent 626b227 commit 92e475f

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,6 @@ private QueueCapacityVector heterogeneousParser(Matcher matcher) {
148148
}
149149
}
150150

151-
// Memory always have to be defined
152-
if (capacityVector.getMemory() == 0L) {
153-
return new QueueCapacityVector();
154-
}
155-
156151
return capacityVector;
157152
}
158153

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,4 +214,19 @@ public void testInvalidCapacityConfigs() {
214214
Lists.newArrayList(nonSetCapacity.iterator());
215215
Assert.assertEquals(nonSetResources.size(), 0);
216216
}
217-
}
217+
218+
@Test
219+
public void testZeroAbsoluteCapacityConfig() {
220+
QueueCapacityVector weightCapacityVector =
221+
capacityConfigParser.parse(String.format(MEMORY_VCORE_TEMPLATE, 0, 0), QUEUE);
222+
223+
QueueCapacityVectorEntry memory = weightCapacityVector.getResource(MEMORY_URI);
224+
QueueCapacityVectorEntry vcore = weightCapacityVector.getResource(VCORES_URI);
225+
226+
Assert.assertEquals(ResourceUnitCapacityType.ABSOLUTE, memory.getVectorResourceType());
227+
Assert.assertEquals(0, memory.getResourceValue(), EPSILON);
228+
229+
Assert.assertEquals(ResourceUnitCapacityType.ABSOLUTE, vcore.getVectorResourceType());
230+
Assert.assertEquals(0, vcore.getResourceValue(), EPSILON);
231+
}
232+
}

0 commit comments

Comments
 (0)