Skip to content

Commit 8f06fb4

Browse files
committed
[FLINK-21450][test] Enables tests that were disabled for the AdaptiveScheduler
For a few tests, a proper explanation is added why the tests are still disabled
1 parent a1d17cc commit 8f06fb4

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

flink-connectors/flink-connector-files/src/test/java/org/apache/flink/connector/file/src/FileSourceTextLinesITCase.java

-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.apache.flink.util.function.FunctionWithException;
4343
import org.apache.flink.util.function.ThrowingConsumer;
4444

45-
import org.junit.jupiter.api.Tag;
4645
import org.junit.jupiter.api.Test;
4746
import org.junit.jupiter.api.extension.RegisterExtension;
4847
import org.junit.jupiter.api.io.TempDir;
@@ -198,7 +197,6 @@ void testContinuousTextFileSource(
198197
* record format (text lines) and restarts TaskManager.
199198
*/
200199
@Test
201-
@Tag("org.apache.flink.testutils.junit.FailsWithAdaptiveScheduler") // FLINK-21450
202200
void testContinuousTextFileSourceWithTaskManagerFailover(@TempDir java.nio.file.Path tmpTestDir)
203201
throws Exception {
204202
// This test will kill TM, so we run it in a new cluster to avoid affecting other tests

flink-end-to-end-tests/run-nightly-tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ function run_group_2 {
233233
# Sticky Scheduling
234234
################################################################################
235235

236-
if [[ ${PROFILE} != *"enable-adaptive-scheduler"* ]]; then #FLINK-21450
236+
if [[ ${PROFILE} != *"enable-adaptive-scheduler"* ]]; then # FLINK-34416
237237
run_test "Local recovery and sticky scheduling end-to-end test" "$END_TO_END_DIR/test-scripts/test_local_recovery_and_scheduling.sh 4 3 hashmap false false 100" "skip_check_exceptions"
238238
run_test "Local recovery and sticky scheduling end-to-end test" "$END_TO_END_DIR/test-scripts/test_local_recovery_and_scheduling.sh 4 3 hashmap false true 100" "skip_check_exceptions"
239239
run_test "Local recovery and sticky scheduling end-to-end test" "$END_TO_END_DIR/test-scripts/test_local_recovery_and_scheduling.sh 4 10 rocks false false 100" "skip_check_exceptions"

flink-runtime/src/test/java/org/apache/flink/runtime/jobmaster/JobMasterTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,9 @@ void testResourceManagerConnectionAfterStart() throws Exception {
10191019
* if this execution fails.
10201020
*/
10211021
@Test
1022-
@Tag("org.apache.flink.testutils.junit.FailsWithAdaptiveScheduler") // FLINK-21450
1022+
// The AdaptiveScheduler doesn't support partial recovery but restarts all Executions in case of
1023+
// a local failure.
1024+
@Tag("org.apache.flink.testutils.junit.FailsWithAdaptiveScheduler")
10231025
void testRequestNextInputSplitWithLocalFailover() throws Exception {
10241026

10251027
configuration.set(

flink-tests/src/test/java/org/apache/flink/test/runtime/DefaultSchedulerLocalRecoveryITCase.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,18 @@ public class DefaultSchedulerLocalRecoveryITCase extends TestLogger {
6060
private static final long TIMEOUT = 10_000L;
6161

6262
@Test
63-
@Category(FailsWithAdaptiveScheduler.class) // FLINK-21450
63+
// The AdaptiveScheduler doesn't update the ExecutionGraph but creates a new Execution during
64+
// local recovery. Recovering can also lead to a change in parallelism which makes the
65+
// executionHistory non-linear. The lack of a linear executionHistory prevents us from applying
66+
// the same test for the AdaptiveScheduler.
67+
@Category(FailsWithAdaptiveScheduler.class)
6468
public void testLocalRecoveryFull() throws Exception {
6569
testLocalRecoveryInternal("full");
6670
}
6771

6872
@Test
69-
@Category(FailsWithAdaptiveScheduler.class) // FLINK-21450
73+
// see comment in #testLocalRecoveryFull
74+
@Category(FailsWithAdaptiveScheduler.class)
7075
public void testLocalRecoveryRegion() throws Exception {
7176
testLocalRecoveryInternal("region");
7277
}

0 commit comments

Comments
 (0)