You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by kk...@apache.org on 2019/02/26 11:16:46 UTC

[flink] branch release-1.6 updated: [FLINK-11745][State TTL][E2E] Restore from the savepoint after the job cancellation.

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

kkloudas 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 950657b  [FLINK-11745][State TTL][E2E] Restore from the savepoint after the job cancellation.
950657b is described below

commit 950657b2e78ef98be6003c38516e1c2b9edd0397
Author: Andrey Zagrebin <az...@gmail.com>
AuthorDate: Mon Feb 25 14:24:06 2019 +0100

    [FLINK-11745][State TTL][E2E] Restore from the savepoint after the job cancellation.
---
 .../test-scripts/test_stream_state_ttl.sh               | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/flink-end-to-end-tests/test-scripts/test_stream_state_ttl.sh b/flink-end-to-end-tests/test-scripts/test_stream_state_ttl.sh
index fb911f3..1a63426 100755
--- a/flink-end-to-end-tests/test-scripts/test_stream_state_ttl.sh
+++ b/flink-end-to-end-tests/test-scripts/test_stream_state_ttl.sh
@@ -22,9 +22,8 @@ source "$(dirname "$0")"/common.sh
 STATE_BACKEND_TYPE="${1:-file}"
 STATE_BACKEND_FILE_ASYNC="${2:-false}"
 TTL="${3:-1000}"
-PRECISION="${4:-5}"
-PARALLELISM="${5-3}"
-UPDATE_NUM="${6-1000}"
+PARALLELISM="${4-3}"
+UPDATE_NUM="${5-1000}"
 
 CHECKPOINT_DIR="file://$TEST_DATA_DIR/savepoint-e2e-test-chckpt-dir"
 
@@ -46,15 +45,19 @@ trap test_cleanup INT
 trap test_cleanup EXIT
 
 start_cluster
-start_taskmanagers $PARALLELISM
+if [ "${PARALLELISM}" -gt "1" ]; then
+    start_taskmanagers $(expr ${PARALLELISM} - 1)
+fi
 
 function job_id() {
-    CMD="${FLINK_DIR}/bin/flink run -d -p ${PARALLELISM} ${TEST_PROGRAM_JAR} \
+    if [ -n "$1" ]; then
+        SP="-s $1"
+    fi
+    CMD="${FLINK_DIR}/bin/flink run -d ${SP} -p ${PARALLELISM} ${TEST_PROGRAM_JAR} \
       --test.semantics exactly-once \
       --environment.parallelism ${PARALLELISM} \
       --state_backend ${STATE_BACKEND_TYPE} \
       --state_ttl_verifier.ttl_milli ${TTL} \
-      --state_ttl_verifier.precision_milli ${PRECISION} \
       --state_backend.checkpoint_directory ${CHECKPOINT_DIR} \
       --state_backend.file.async ${STATE_BACKEND_FILE_ASYNC} \
       --update_generator_source.sleep_time 10 \
@@ -73,7 +76,7 @@ SAVEPOINT_PATH=$(take_savepoint ${JOB} ${TEST_DATA_DIR} \
 
 cancel_job ${JOB}
 
-JOB_CMD=$(job_id)
+JOB_CMD=$(job_id ${SAVEPOINT_PATH})
 echo ${JOB_CMD}
 JOB=$(${JOB_CMD} | grep 'Job has been submitted with JobID' | sed 's/.* //g')
 wait_job_running ${JOB}