[FLINK-10361] Harden instable elastic search end-to-end test case

This closes apache#6789.
mbalassi · Oct 10, 2018 · f071cd5 · f071cd5
1 parent 2f9d955
commit f071cd5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/flink-end-to-end-tests/test-scripts/elasticsearch-common.sh b/flink-end-to-end-tests/test-scripts/elasticsearch-common.sh
@@ -41,22 +41,22 @@ function setup_elasticsearch {
  $elasticsearchDir/bin/elasticsearch &
 }
 
-function verify_elasticsearch_process_exist {
- for ((i=1;i<=10;i++)); do
- local elasticsearchProcess=$(jps | grep Elasticsearch | awk '{print $2}')
+function wait_elasticsearch_working {
+ echo "Waiting for Elasticsearch node to work..."
 
- echo "Waiting for Elasticsearch node to start ..."
+ for ((i=1;i<=60;i++)); do
+ curl -XGET 'http:https://localhost:9200'
 
- # make sure the elasticsearch node is actually running
- if [ "$elasticsearchProcess" != "Elasticsearch" ]; then
+ # make sure the elasticsearch node is actually working
+ if [ $? -ne 0 ]; then
  sleep 1
  else
- echo "Elasticsearch node is running."
+ echo "Elasticsearch node is working."
  return
  fi
  done
 
- echo "Elasticsearch node did not start properly"
+ echo "Elasticsearch node is not working"
  exit 1
 }
 

diff --git a/flink-end-to-end-tests/test-scripts/test_quickstarts.sh b/flink-end-to-end-tests/test-scripts/test_quickstarts.sh
@@ -95,7 +95,7 @@ else
 fi
 
 setup_elasticsearch "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.1.2.tar.gz"
-verify_elasticsearch_process_exist
+wait_elasticsearch_working
 
 function shutdownAndCleanup {
  # don't call ourselves again for another signal interruption

diff --git a/flink-end-to-end-tests/test-scripts/test_sql_client.sh b/flink-end-to-end-tests/test-scripts/test_sql_client.sh
@@ -109,7 +109,7 @@ ELASTICSEARCH_VERSION=6
 DOWNLOAD_URL='https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.3.1.tar.gz'
 
 setup_elasticsearch $DOWNLOAD_URL
-verify_elasticsearch_process_exist
+wait_elasticsearch_working
 
 ################################################################################
 # Run a SQL statement

diff --git a/flink-end-to-end-tests/test-scripts/test_streaming_elasticsearch.sh b/flink-end-to-end-tests/test-scripts/test_streaming_elasticsearch.sh
@@ -26,7 +26,7 @@ DOWNLOAD_URL=$2
 mkdir -p $TEST_DATA_DIR
 
 setup_elasticsearch $DOWNLOAD_URL
-verify_elasticsearch_process_exist
+wait_elasticsearch_working
 
 start_cluster