You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ro...@apache.org on 2021/05/19 12:29:45 UTC

[flink] 02/02: [FLINK-21329][tests] Increase timeout and delay in local test_local_recovery_and_scheduling.sh

This is an automated email from the ASF dual-hosted git repository.

roman pushed a commit to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 2f1e7928258876970ac9859e7afe070c9f03fa96
Author: Roman Khachatryan <kh...@gmail.com>
AuthorDate: Thu Apr 15 13:05:21 2021 +0200

    [FLINK-21329][tests] Increase timeout and delay in local test_local_recovery_and_scheduling.sh
    
    Back-pressure is likely to occur without injection delay at the source
    which may lead to delaying checkpoint triggering at the sources
    which may lead to a timeout.
    
    To prevent this, test timeout is increased from 10m to 15m
    and injection delay of 100ms is added.
---
 flink-end-to-end-tests/run-nightly-tests.sh                  | 12 ++++++------
 .../test-scripts/test_local_recovery_and_scheduling.sh       |  8 +++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/flink-end-to-end-tests/run-nightly-tests.sh b/flink-end-to-end-tests/run-nightly-tests.sh
index 7156962..ef8b0a8 100755
--- a/flink-end-to-end-tests/run-nightly-tests.sh
+++ b/flink-end-to-end-tests/run-nightly-tests.sh
@@ -245,12 +245,12 @@ fi
 ################################################################################
 
 if [[ ${PROFILE} != *"enable-adaptive-scheduler"* ]]; then #FLINK-21450
-	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" "skip_check_exceptions"
-	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" "skip_check_exceptions"
-	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" "skip_check_exceptions"
-	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 true false" "skip_check_exceptions"
-	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 true" "skip_check_exceptions"
-	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 true true" "skip_check_exceptions"
+	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"
+	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"
+	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"
+	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 true false 100" "skip_check_exceptions"
+	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 true 100" "skip_check_exceptions"
+	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 true true 100" "skip_check_exceptions"
 fi
 
 printf "\n[PASS] All bash e2e-tests passed\n"
diff --git a/flink-end-to-end-tests/test-scripts/test_local_recovery_and_scheduling.sh b/flink-end-to-end-tests/test-scripts/test_local_recovery_and_scheduling.sh
index dbd55dc..0d38beb 100755
--- a/flink-end-to-end-tests/test-scripts/test_local_recovery_and_scheduling.sh
+++ b/flink-end-to-end-tests/test-scripts/test_local_recovery_and_scheduling.sh
@@ -60,13 +60,15 @@ function run_local_recovery_test {
     local backend=$3
     local incremental=$4
     local kill_jvm=$5
+    local delay=$6
 
     echo "Running local recovery test with configuration:
         parallelism: ${parallelism}
         max attempts: ${max_attempts}
         backend: ${backend}
         incremental checkpoints: ${incremental}
-        kill JVM: ${kill_jvm}"
+        kill JVM: ${kill_jvm}
+        delay: ${delay}ms"
 
     TEST_PROGRAM_JAR=${END_TO_END_DIR}/flink-local-recovery-and-allocation-test/target/StickyAllocationAndLocalRecoveryTestJob.jar
     # configure for HA
@@ -97,11 +99,11 @@ function run_local_recovery_test {
     --checkpointDir file://$TEST_DATA_DIR/local_recovery_test/checkpoints \
     --output $TEST_DATA_DIR/out/local_recovery_test/out --killJvmOnFail ${kill_jvm} --checkpointInterval 1000 \
     --maxAttempts ${max_attempts} --parallelism ${parallelism} --stateBackend ${backend} \
-    --incrementalCheckpoints ${incremental}
+    --incrementalCheckpoints ${incremental} --delay ${delay}
 
     check_logs ${parallelism} ${max_attempts}
     cleanup_after_test
 }
 
 ## MAIN
-run_test_with_timeout 600 run_local_recovery_test "$@"
+run_test_with_timeout 900 run_local_recovery_test "$@"