This is an automated email from the ASF dual-hosted git repository. gary pushed a commit to branch FLINK-14651 in repository https://gitbox.apache.org/repos/asf/flink.git
commit ed2edcdb0ff8c5dc6371c4ff373bcdb4d90faf34 Author: Gary Yao <[email protected]> AuthorDate: Wed Nov 13 13:16:43 2019 +0100 Improve Streaming File Sink end-to-end test --- .../src/main/java/StreamingFileSinkProgram.java | 2 +- .../test-scripts/test_streaming_file_sink.sh | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/flink-end-to-end-tests/flink-streaming-file-sink-test/src/main/java/StreamingFileSinkProgram.java b/flink-end-to-end-tests/flink-streaming-file-sink-test/src/main/java/StreamingFileSinkProgram.java index 161ed69..ac623ac 100644 --- a/flink-end-to-end-tests/flink-streaming-file-sink-test/src/main/java/StreamingFileSinkProgram.java +++ b/flink-end-to-end-tests/flink-streaming-file-sink-test/src/main/java/StreamingFileSinkProgram.java @@ -58,7 +58,7 @@ public enum StreamingFileSinkProgram { env.setParallelism(4); env.enableCheckpointing(5000L); - env.setRestartStrategy(RestartStrategies.fixedDelayRestart(3, Time.of(10L, TimeUnit.SECONDS))); + env.setRestartStrategy(RestartStrategies.fixedDelayRestart(Integer.MAX_VALUE, Time.of(10L, TimeUnit.SECONDS))); final StreamingFileSink<Tuple2<Integer, Integer>> sink = StreamingFileSink .forRowFormat(new Path(outputPath), (Encoder<Tuple2<Integer, Integer>>) (element, stream) -> { diff --git a/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh b/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh index aa711f9..edcdc01 100755 --- a/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh +++ b/flink-end-to-end-tests/test-scripts/test_streaming_file_sink.sh @@ -31,6 +31,8 @@ set_conf_ssl "mutual" "OPENSSL" "${OPENSSL_LINKAGE}" set_config_key "metrics.fetcher.update-interval" "2000" # this test relies on global failovers set_config_key "jobmanager.execution.failover-strategy" "full" +set_config_key "heartbeat.interval" "2000" +set_config_key "heartbeat.timeout" "10000" OUT=temp/test_streaming_file_sink-$(uuidgen) OUTPUT_PATH="$TEST_DATA_DIR/$OUT" @@ -162,16 +164,6 @@ echo "Starting TM" wait_for_restart_to_complete 0 ${JOB_ID} -echo "Killing 2 TMs" -kill_random_taskmanager -kill_random_taskmanager - -echo "Starting 2 TMs" -"$FLINK_DIR/bin/taskmanager.sh" start -"$FLINK_DIR/bin/taskmanager.sh" start - -wait_for_restart_to_complete 1 ${JOB_ID} - echo "Waiting until all values have been produced" wait_for_complete_result 60000 900
