Skip to content

[FLINK-22624][runtime] Utilize the remain resource of new pending tas… #15888

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

Closed
KarmaGYZ wants to merge 1 commit into from
Closed

[FLINK-22624][runtime] Utilize the remain resource of new pending tas… #15888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions ...g/apache/flink/runtime/resourcemanager/slotmanager/DefaultResourceAllocationStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,17 @@ private void tryFulfillRequirementsForJobWithPendingResources(
Collection<ResourceRequirement> unfulfilledRequirements,
List<InternalResourceInfo> availableResources,
ResourceAllocationResult.Builder resultBuilder) {
final Collection<ResourceRequirement> missingResources =
tryFulfillRequirementsForJobWithResources(
jobId, unfulfilledRequirements, availableResources);
for (ResourceRequirement missingResource : missingResources) {
for (ResourceRequirement missingResource : unfulfilledRequirements) {
// for this strategy, all pending resources should have the same default slot resource
final ResourceProfile effectiveProfile =
getEffectiveResourceProfile(
missingResource.getResourceProfile(), defaultSlotResourceProfile);
int numUnfulfilled = missingResource.getNumberOfRequiredSlots();
int numUnfulfilled =
tryFulfilledRequirementWithResource(
availableResources,
missingResource.getNumberOfRequiredSlots(),
missingResource.getResourceProfile(),
jobId);

if (!totalResourceProfile.allFieldsNoLessThan(effectiveProfile)) {
// Can not fulfill this resource type will the default worker.
Expand Down
8 changes: 4 additions & 4 deletions ...ache/flink/runtime/resourcemanager/slotmanager/DefaultResourceAllocationStrategyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ public void testFulfillRequirementWithPendingResources() {
.setPendingTaskManagersSupplier(
() -> Collections.singleton(pendingTaskManager))
.build();
requirements.add(ResourceRequirement.create(largeResource, 1));
requirements.add(ResourceRequirement.create(ResourceProfile.UNKNOWN, 7));
requirements.add(ResourceRequirement.create(largeResource, 2));
requirements.add(ResourceRequirement.create(ResourceProfile.UNKNOWN, 4));

final ResourceAllocationResult result =
STRATEGY.tryFulfillRequirements(
Expand Down Expand Up @@ -127,8 +127,8 @@ public void testFulfillRequirementWithPendingResources() {
resourceWithCount.getKey(), resourceWithCount.getValue());
}

assertThat(allFulfilledRequirements.getResourceCount(DEFAULT_SLOT_RESOURCE), is(7));
assertThat(allFulfilledRequirements.getResourceCount(largeResource), is(1));
assertThat(allFulfilledRequirements.getResourceCount(DEFAULT_SLOT_RESOURCE), is(4));
assertThat(allFulfilledRequirements.getResourceCount(largeResource), is(2));
}

@Test
Expand Down