[flink] branch release-1.11 updated: [FLINK-19436][tests] Properly shutdown cluster in e2e tests

[jark]

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

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


The following commit(s) were added to refs/heads/release-1.11 by this push:
     new cece43b  [FLINK-19436][tests] Properly shutdown cluster in e2e tests
cece43b is described below

commit cece43b93b94d5e424583d69717c7ab55f8d45b7
Author: Leonard Xu <xbjt...@163.com>
AuthorDate: Mon Jan 25 21:59:57 2021 +0800

    [FLINK-19436][tests] Properly shutdown cluster in e2e tests
    
    This closes #14747
---
 flink-end-to-end-tests/test-scripts/common.sh             | 2 ++
 flink-end-to-end-tests/test-scripts/test_batch_sql.sh     | 6 ------
 flink-end-to-end-tests/test-scripts/test_streaming_sql.sh | 6 ------
 flink-end-to-end-tests/test-scripts/test_tpcds.sh         | 6 ------
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/flink-end-to-end-tests/test-scripts/common.sh 
b/flink-end-to-end-tests/test-scripts/common.sh
index 883961d..46e48ba 100644
--- a/flink-end-to-end-tests/test-scripts/common.sh
+++ b/flink-end-to-end-tests/test-scripts/common.sh
@@ -434,6 +434,8 @@ function check_logs_for_non_empty_out_files {
 
 function shutdown_all {
   stop_cluster
+  # stop TMs which started by command: bin/taskmanager.sh start
+  "$FLINK_DIR"/bin/taskmanager.sh stop-all
   tm_kill_all
   jm_kill_all
 }
diff --git a/flink-end-to-end-tests/test-scripts/test_batch_sql.sh 
b/flink-end-to-end-tests/test-scripts/test_batch_sql.sh
index dc9b931..b7e45e7 100755
--- a/flink-end-to-end-tests/test-scripts/test_batch_sql.sh
+++ b/flink-end-to-end-tests/test-scripts/test_batch_sql.sh
@@ -69,12 +69,6 @@ GROUP BY TUMBLE(rowtime, INTERVAL '20' SECOND)"
 
 set_config_key "taskmanager.numberOfTaskSlots" "1"
 
-function sql_cleanup() {
-  stop_cluster
-  $FLINK_DIR/bin/taskmanager.sh stop-all
-}
-on_exit sql_cleanup
-
 start_cluster
 
 # The task has total 2 x (1 + 1 + 1 + 1) + 1 = 9 slots
diff --git a/flink-end-to-end-tests/test-scripts/test_streaming_sql.sh 
b/flink-end-to-end-tests/test-scripts/test_streaming_sql.sh
index aa40f8e..3b9bca8 100755
--- a/flink-end-to-end-tests/test-scripts/test_streaming_sql.sh
+++ b/flink-end-to-end-tests/test-scripts/test_streaming_sql.sh
@@ -30,12 +30,6 @@ $FLINK_DIR/bin/taskmanager.sh start
 
 $FLINK_DIR/bin/flink run -p 4 $TEST_PROGRAM_JAR -outputPath 
file://${TEST_DATA_DIR}/out/result -planner ${PLANNER}
 
-function sql_cleanup() {
-  stop_cluster
-  $FLINK_DIR/bin/taskmanager.sh stop-all
-}
-on_exit sql_cleanup
-
 # collect results from files
 cat $TEST_DATA_DIR/out/result/20/.part-* $TEST_DATA_DIR/out/result/20/part-* | 
sort > $TEST_DATA_DIR/out/result-complete
 
diff --git a/flink-end-to-end-tests/test-scripts/test_tpcds.sh 
b/flink-end-to-end-tests/test-scripts/test_tpcds.sh
index 2e31c7b..514cc46 100755
--- a/flink-end-to-end-tests/test-scripts/test_tpcds.sh
+++ b/flink-end-to-end-tests/test-scripts/test_tpcds.sh
@@ -72,12 +72,6 @@ mkdir -p "$RESULT_DIR"
 
 $FLINK_DIR/bin/flink run -c org.apache.flink.table.tpcds.TpcdsTestProgram 
"$TARGET_DIR/TpcdsTestProgram.jar" -sourceTablePath "$TPCDS_DATA_DIR" 
-queryPath "$TPCDS_QUERY_DIR" -sinkTablePath "$RESULT_DIR" -useTableStats 
"$USE_TABLE_STATS"
 
-function sql_cleanup() {
-  stop_cluster
-  $FLINK_DIR/bin/taskmanager.sh stop-all
-}
-on_exit sql_cleanup
-
 
################################################################################
 # validate result
 
################################################################################