Skip to content
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

Jump to bottom

[BP-1.19][FLINK-34274][runtime] Implicitly disable resource wait timeout for AdaptiveSchedulerTest #24400

Merged
merged 2 commits into from
Feb 28, 2024
Merged

[BP-1.19][FLINK-34274][runtime] Implicitly disable resource wait timeout for AdaptiveSchedulerTest #24400

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
49f91a1
[FLINK-34274][runtime] Implicitly disable resource wait timeout for A…
dmvk Jan 30, 2024
1f77939
Fixes test: The comment is obsolete (because we're not using the reso…
XComp Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...e/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.concurrent.ScheduledExecutorService;
import java.util.function.Function;

/** Builder for {@link AdaptiveScheduler}. */
public class AdaptiveSchedulerBuilder {
Expand Down Expand Up @@ -117,6 +118,12 @@ public AdaptiveSchedulerBuilder setJobMasterConfiguration(
return this;
}

public AdaptiveSchedulerBuilder withConfigurationOverride(
Function<Configuration, Configuration> modifyFn) {
this.jobMasterConfiguration = modifyFn.apply(jobMasterConfiguration);
return this;
}

public AdaptiveSchedulerBuilder setUserCodeLoader(final ClassLoader userCodeLoader) {
this.userCodeLoader = userCodeLoader;
return this;
Expand Down
18 changes: 9 additions & 9 deletions ...time/src/test/java/org/apache/flink/runtime/scheduler/adaptive/AdaptiveSchedulerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,6 +1216,13 @@ void testInitialRequirementLowerBoundBeyondAvailableSlotsCausesImmediateFailure(

final AdaptiveScheduler scheduler =
prepareSchedulerWithNoTimeouts(jobGraph, declarativeSlotPool)
.withConfigurationOverride(
conf -> {
conf.set(
JobManagerOptions.RESOURCE_WAIT_TIMEOUT,
Duration.ofMillis(1));
return conf;
})
.setJobResourceRequirements(initialJobResourceRequirements)
.build();

Expand Down Expand Up @@ -1256,14 +1263,6 @@ void testRequirementLowerBoundDecreaseAfterResourceScarcityBelowAvailableSlots()
startJobWithSlotsMatchingParallelism(
scheduler, declarativeSlotPool, taskManagerGateway, availableSlots);

// at this point we'd ideally check that the job is stuck in WaitingForResources, but we
// can't differentiate between waiting due to the minimum requirements not being fulfilled
// and the resource timeout not being elapsed
// We just continue here, as the following tests validate that the lower bound can prevent
// a job from running:
// - #testInitialRequirementLowerBoundBeyondAvailableSlotsCausesImmediateFailure()
// - #testRequirementLowerBoundIncreaseBeyondCurrentParallelismAttemptsImmediateRescale()

// unlock job by decreasing the parallelism
JobResourceRequirements newJobResourceRequirements =
createRequirementsWithLowerAndUpperParallelism(availableSlots, PARALLELISM);
Expand All @@ -1275,7 +1274,8 @@ void testRequirementLowerBoundDecreaseAfterResourceScarcityBelowAvailableSlots()

private static Configuration createConfigurationWithNoTimeouts() {
return new Configuration()
.set(JobManagerOptions.RESOURCE_WAIT_TIMEOUT, Duration.ofMillis(1L))
.set(JobManagerOptions.RESOURCE_WAIT_TIMEOUT, Duration.ofMillis(-1L))
.set(JobManagerOptions.RESOURCE_STABILIZATION_TIMEOUT, Duration.ofMillis(1L))
.set(JobManagerOptions.SCHEDULER_SCALING_INTERVAL_MIN, Duration.ofMillis(1L));
}

Expand Down