[flink] branch release-1.10 updated: [FLINK-15772] Add retry to test_batch_wordcount file fetching

[al...@apache.org]

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

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


The following commit(s) were added to refs/heads/release-1.10 by this push:
     new 0ad2f06  [FLINK-15772] Add retry to test_batch_wordcount file fetching
0ad2f06 is described below

commit 0ad2f0634e81921472ebb506f9d826c7ad6f69a3
Author: Aljoscha Krettek <al...@apache.org>
AuthorDate: Mon Apr 6 12:44:45 2020 +0200

    [FLINK-15772] Add retry to test_batch_wordcount file fetching
    
    The suspicion is that test flakyness was caused by S3 flakyness/eventual
    consistency.
---
 flink-end-to-end-tests/test-scripts/common_s3_operations.sh | 1 +
 flink-end-to-end-tests/test-scripts/test_batch_wordcount.sh | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/flink-end-to-end-tests/test-scripts/common_s3_operations.sh b/flink-end-to-end-tests/test-scripts/common_s3_operations.sh
index eae745b..f784c7d 100644
--- a/flink-end-to-end-tests/test-scripts/common_s3_operations.sh
+++ b/flink-end-to-end-tests/test-scripts/common_s3_operations.sh
@@ -73,6 +73,7 @@ function aws_cli() {
   fi
   if ! docker exec "$AWSCLI_CONTAINER_ID" aws $endpoint "$@"; then
     echo "Error executing aws command: $@";
+    return 1
   fi
 }
 
diff --git a/flink-end-to-end-tests/test-scripts/test_batch_wordcount.sh b/flink-end-to-end-tests/test-scripts/test_batch_wordcount.sh
index e0cedf4..59870f7 100755
--- a/flink-end-to-end-tests/test-scripts/test_batch_wordcount.sh
+++ b/flink-end-to-end-tests/test-scripts/test_batch_wordcount.sh
@@ -85,5 +85,10 @@ start_cluster
 # But the sources should provide the same test data, so the checksum stays the same for all tests.
 ${FLINK_DIR}/bin/flink run -p 1 ${FLINK_DIR}/examples/batch/WordCount.jar ${ARGS}
 # Fetches result from AWS s3 to the OUTPUT_PATH, no-op for other filesystems and minio-based tests
-${fetch_complete_result[@]}
+
+# it seems we need a function for retry_times
+function fetch_it() {
+  ${fetch_complete_result[@]}
+}
+retry_times 10 5 fetch_it
 check_result_hash "WordCount (${INPUT_TYPE})" "${OUTPUT_PATH}" "${RESULT_HASH}"