You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/08/08 08:09:30 UTC
[flink] branch release-1.6 updated: [FLINK-10094][tests] Always
backup config before running test
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.6
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.6 by this push:
new 210e3bb [FLINK-10094][tests] Always backup config before running test
210e3bb is described below
commit 210e3bbe276bab2e6703f89042324af6339f649c
Author: Chesnay <ch...@apache.org>
AuthorDate: Wed Aug 8 10:08:03 2018 +0200
[FLINK-10094][tests] Always backup config before running test
---
flink-end-to-end-tests/test-scripts/common.sh | 2 --
flink-end-to-end-tests/test-scripts/test-runner-common.sh | 1 +
flink-end-to-end-tests/test-scripts/test_batch_allround.sh | 1 -
.../test-scripts/test_high_parallelism_iterations.sh | 2 --
.../test-scripts/test_local_recovery_and_scheduling.sh | 3 +--
flink-end-to-end-tests/test-scripts/test_queryable_state_restart_tm.sh | 1 -
.../test-scripts/test_resume_externalized_checkpoints.sh | 1 -
flink-end-to-end-tests/test-scripts/test_resume_savepoint.sh | 1 -
.../test-scripts/test_stateful_stream_job_upgrade.sh | 1 -
flink-end-to-end-tests/test-scripts/test_streaming_bucketing.sh | 1 -
10 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/flink-end-to-end-tests/test-scripts/common.sh b/flink-end-to-end-tests/test-scripts/common.sh
index 46dda70..cd21b7b 100644
--- a/flink-end-to-end-tests/test-scripts/common.sh
+++ b/flink-end-to-end-tests/test-scripts/common.sh
@@ -102,8 +102,6 @@ function change_conf() {
function create_ha_config() {
- backup_config
-
# clean up the dir that will be used for zookeeper storage
# (see high-availability.zookeeper.storageDir below)
if [ -e $TEST_DATA_DIR/recovery ]; then
diff --git a/flink-end-to-end-tests/test-scripts/test-runner-common.sh b/flink-end-to-end-tests/test-scripts/test-runner-common.sh
index fee67a4..427416e 100644
--- a/flink-end-to-end-tests/test-scripts/test-runner-common.sh
+++ b/flink-end-to-end-tests/test-scripts/test-runner-common.sh
@@ -37,6 +37,7 @@ function run_test {
export TEST_DATA_DIR=$TEST_INFRA_DIR/temp-test-directory-$(date +%S%N)
echo "TEST_DATA_DIR: $TEST_DATA_DIR"
+ backup_config
start_timer
${command}
exit_code="$?"
diff --git a/flink-end-to-end-tests/test-scripts/test_batch_allround.sh b/flink-end-to-end-tests/test-scripts/test_batch_allround.sh
index 31c20f5..2bb274b 100755
--- a/flink-end-to-end-tests/test-scripts/test_batch_allround.sh
+++ b/flink-end-to-end-tests/test-scripts/test_batch_allround.sh
@@ -28,7 +28,6 @@ cp $FLINK_DIR/conf/flink-conf.yaml $FLINK_DIR/conf/flink-conf.yaml.bak
echo "taskmanager.network.memory.min: 10485760" >> $FLINK_DIR/conf/flink-conf.yaml
echo "taskmanager.network.memory.max: 10485760" >> $FLINK_DIR/conf/flink-conf.yaml
-backup_config
set_conf_ssl
start_cluster
$FLINK_DIR/bin/taskmanager.sh start
diff --git a/flink-end-to-end-tests/test-scripts/test_high_parallelism_iterations.sh b/flink-end-to-end-tests/test-scripts/test_high_parallelism_iterations.sh
index 5a06266..d534be0 100755
--- a/flink-end-to-end-tests/test-scripts/test_high_parallelism_iterations.sh
+++ b/flink-end-to-end-tests/test-scripts/test_high_parallelism_iterations.sh
@@ -25,8 +25,6 @@ TEST=flink-high-parallelism-iterations-test
TEST_PROGRAM_NAME=HighParallelismIterationsTestProgram
TEST_PROGRAM_JAR=${END_TO_END_DIR}/$TEST/target/$TEST_PROGRAM_NAME.jar
-backup_config
-
set_conf "taskmanager.heap.mb" "52" # 52Mb x 100 TMs = 5Gb total heap
set_conf "taskmanager.memory.size" "8" # 8Mb
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 5e73591..7dfca93 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
@@ -77,8 +77,7 @@ function run_local_recovery_test {
kill JVM: ${kill_jvm}"
TEST_PROGRAM_JAR=${END_TO_END_DIR}/flink-local-recovery-and-allocation-test/target/StickyAllocationAndLocalRecoveryTestJob.jar
- # Backup conf and configure for HA
- backup_config
+ # configure for HA
create_ha_config
# Enable debug logging
diff --git a/flink-end-to-end-tests/test-scripts/test_queryable_state_restart_tm.sh b/flink-end-to-end-tests/test-scripts/test_queryable_state_restart_tm.sh
index d8d08df..0ce3db6 100755
--- a/flink-end-to-end-tests/test-scripts/test_queryable_state_restart_tm.sh
+++ b/flink-end-to-end-tests/test-scripts/test_queryable_state_restart_tm.sh
@@ -55,7 +55,6 @@ function run_test() {
clean_log_files
clean_stdout_files
- backup_config
# speeds up TM loss detection
set_conf "heartbeat.interval" "2000"
set_conf "heartbeat.timeout" "10000"
diff --git a/flink-end-to-end-tests/test-scripts/test_resume_externalized_checkpoints.sh b/flink-end-to-end-tests/test-scripts/test_resume_externalized_checkpoints.sh
index cb09e8d..e1ba65d 100755
--- a/flink-end-to-end-tests/test-scripts/test_resume_externalized_checkpoints.sh
+++ b/flink-end-to-end-tests/test-scripts/test_resume_externalized_checkpoints.sh
@@ -37,7 +37,6 @@ else
NUM_SLOTS=$NEW_DOP
fi
-backup_config
change_conf "taskmanager.numberOfTaskSlots" "1" "${NUM_SLOTS}"
setup_flink_slf4j_metric_reporter
start_cluster
diff --git a/flink-end-to-end-tests/test-scripts/test_resume_savepoint.sh b/flink-end-to-end-tests/test-scripts/test_resume_savepoint.sh
index fd0bf91..3057486 100755
--- a/flink-end-to-end-tests/test-scripts/test_resume_savepoint.sh
+++ b/flink-end-to-end-tests/test-scripts/test_resume_savepoint.sh
@@ -55,7 +55,6 @@ else
NUM_SLOTS=$NEW_DOP
fi
-backup_config
change_conf "taskmanager.numberOfTaskSlots" "1" "${NUM_SLOTS}"
if [ $STATE_BACKEND_ROCKS_TIMER_SERVICE_TYPE == 'rocks' ]; then
diff --git a/flink-end-to-end-tests/test-scripts/test_stateful_stream_job_upgrade.sh b/flink-end-to-end-tests/test-scripts/test_stateful_stream_job_upgrade.sh
index f7c987e..c042368 100755
--- a/flink-end-to-end-tests/test-scripts/test_stateful_stream_job_upgrade.sh
+++ b/flink-end-to-end-tests/test-scripts/test_stateful_stream_job_upgrade.sh
@@ -28,7 +28,6 @@ else
NUM_SLOTS=${NEW_DOP}
fi
-backup_config
change_conf "taskmanager.numberOfTaskSlots" "1" "${NUM_SLOTS}"
setup_flink_slf4j_metric_reporter
diff --git a/flink-end-to-end-tests/test-scripts/test_streaming_bucketing.sh b/flink-end-to-end-tests/test-scripts/test_streaming_bucketing.sh
index 0e12d39..ba43e21 100755
--- a/flink-end-to-end-tests/test-scripts/test_streaming_bucketing.sh
+++ b/flink-end-to-end-tests/test-scripts/test_streaming_bucketing.sh
@@ -24,7 +24,6 @@ TEST_PROGRAM_JAR=${END_TO_END_DIR}/flink-bucketing-sink-test/target/BucketingSin
# enable DEBUG logging level to retrieve truncate length later
sed -i -e 's/#log4j.logger.org.apache.flink=INFO/log4j.logger.org.apache.flink=DEBUG/g' $FLINK_DIR/conf/log4j.properties
-backup_config
set_conf_ssl
start_cluster
$FLINK_DIR/bin/taskmanager.sh start