Skip to content

YARN-11646. Do not ignore zero memory capacity config in QueueCapacityConfigParser. #6433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brumi1024 merged 2 commits into from
Jan 11, 2024
Merged

YARN-11646. Do not ignore zero memory capacity config in QueueCapacityConfigParser. #6433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29d5dd4
YARN-11646. Do not ignore zero memory capacity config in QueueCapacit…
tomicooler Jan 10, 2024
60444ba
fix checkstyle
tomicooler Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ...hadoop/yarn/server/resourcemanager/scheduler/capacity/conf/QueueCapacityConfigParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,6 @@ private QueueCapacityVector heterogeneousParser(Matcher matcher) {
}
}

// Memory always have to be defined
if (capacityVector.getMemory() == 0L) {
return new QueueCapacityVector();
}

return capacityVector;
}

Expand Down
17 changes: 16 additions & 1 deletion ...op/yarn/server/resourcemanager/scheduler/capacity/conf/TestQueueCapacityConfigParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,19 @@ public void testInvalidCapacityConfigs() {
Lists.newArrayList(nonSetCapacity.iterator());
Assert.assertEquals(nonSetResources.size(), 0);
}
}

@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);
}
}