You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2020/06/08 08:13:48 UTC
[flink] branch release-1.11 updated: [FLINK-16350] Support
Zookeeper 3.5 in test_ha_per_job_cluster_datastream.sh
This is an automated email from the ASF dual-hosted git repository.
trohrmann 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 e604784 [FLINK-16350] Support Zookeeper 3.5 in test_ha_per_job_cluster_datastream.sh
e604784 is described below
commit e60478429fe09df9126022eca0a756203a3dc17b
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Fri Jun 5 16:29:31 2020 +0200
[FLINK-16350] Support Zookeeper 3.5 in test_ha_per_job_cluster_datastream.sh
This closes #12504.
---
flink-end-to-end-tests/test-scripts/test_ha_datastream.sh | 2 +-
.../test-scripts/test_ha_per_job_cluster_datastream.sh | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/flink-end-to-end-tests/test-scripts/test_ha_datastream.sh b/flink-end-to-end-tests/test-scripts/test_ha_datastream.sh
index dd9b51e..bbe0ac8 100755
--- a/flink-end-to-end-tests/test-scripts/test_ha_datastream.sh
+++ b/flink-end-to-end-tests/test-scripts/test_ha_datastream.sh
@@ -57,7 +57,7 @@ function run_ha_test() {
start_local_zk
start_cluster
- echo "Running on HA mode: parallelism=${PARALLELISM}, backend=${BACKEND}, asyncSnapshots=${ASYNC}, and incremSnapshots=${INCREM}."
+ echo "Running on HA mode: parallelism=${PARALLELISM}, backend=${BACKEND}, asyncSnapshots=${ASYNC}, incremSnapshots=${INCREM} and zk=${ZOOKEEPER_VERSION}."
# submit a job in detached mode and let it run
local JOB_ID=$($FLINK_DIR/bin/flink run -d -p ${PARALLELISM} \
diff --git a/flink-end-to-end-tests/test-scripts/test_ha_per_job_cluster_datastream.sh b/flink-end-to-end-tests/test-scripts/test_ha_per_job_cluster_datastream.sh
index 13a1522..58b3e6f 100755
--- a/flink-end-to-end-tests/test-scripts/test_ha_per_job_cluster_datastream.sh
+++ b/flink-end-to-end-tests/test-scripts/test_ha_per_job_cluster_datastream.sh
@@ -99,6 +99,7 @@ function run_ha_test() {
local BACKEND=$2
local ASYNC=$3
local INCREM=$4
+ local ZOOKEEPER_VERSION=$5
local JM_KILLS=3
@@ -114,9 +115,10 @@ function run_ha_test() {
# jm killing loop
set_config_key "env.pid.dir" "${TEST_DATA_DIR}"
+ setup_flink_shaded_zookeeper ${ZOOKEEPER_VERSION}
start_local_zk
- echo "Running on HA mode: parallelism=${PARALLELISM}, backend=${BACKEND}, asyncSnapshots=${ASYNC}, and incremSnapshots=${INCREM}."
+ echo "Running on HA mode: parallelism=${PARALLELISM}, backend=${BACKEND}, asyncSnapshots=${ASYNC}, incremSnapshots=${INCREM} and zk=${ZOOKEEPER_VERSION}."
# submit a job in detached mode and let it run
run_job ${PARALLELISM} ${BACKEND} ${ASYNC} ${INCREM}
@@ -152,6 +154,7 @@ function run_ha_test() {
STATE_BACKEND_TYPE=${1:-file}
STATE_BACKEND_FILE_ASYNC=${2:-true}
STATE_BACKEND_ROCKS_INCREMENTAL=${3:-false}
+ZOOKEEPER_VERSION=${4:-3.4}
function kill_test_watchdog() {
local watchdog_pid=`cat $TEST_DATA_DIR/job_watchdog.pid`
@@ -169,7 +172,5 @@ on_exit kill_test_watchdog
kill "$cmdpid") & watchdog_pid=$!
echo $watchdog_pid > $TEST_DATA_DIR/job_watchdog.pid
- run_ha_test 4 ${STATE_BACKEND_TYPE} ${STATE_BACKEND_FILE_ASYNC} ${STATE_BACKEND_ROCKS_INCREMENTAL}
+ run_ha_test 4 ${STATE_BACKEND_TYPE} ${STATE_BACKEND_FILE_ASYNC} ${STATE_BACKEND_ROCKS_INCREMENTAL} ${ZOOKEEPER_VERSION}
)
-
-