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

gaborgsomogyi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new 31d01f24 [FLINK-34198] Remove e2e test operator log error check
31d01f24 is described below

commit 31d01f246d8a344b560aab1653b7aba561baea26
Author: Gabor Somogyi <gabor_somog...@apple.com>
AuthorDate: Mon Jan 22 17:33:07 2024 +0100

    [FLINK-34198] Remove e2e test operator log error check
---
 e2e-tests/test_application_kubernetes_ha.sh |  2 --
 e2e-tests/test_application_operations.sh    |  2 --
 e2e-tests/test_autoscaler.sh                |  2 --
 e2e-tests/test_multi_sessionjob.sh          |  2 --
 e2e-tests/test_sessionjob_kubernetes_ha.sh  |  2 --
 e2e-tests/test_sessionjob_operations.sh     |  2 --
 e2e-tests/utils.sh                          | 31 -----------------------------
 7 files changed, 43 deletions(-)

diff --git a/e2e-tests/test_application_kubernetes_ha.sh 
b/e2e-tests/test_application_kubernetes_ha.sh
index 3c1a4d82..1797b29a 100755
--- a/e2e-tests/test_application_kubernetes_ha.sh
+++ b/e2e-tests/test_application_kubernetes_ha.sh
@@ -47,7 +47,5 @@ wait_for_logs $jm_pod_name "Completed checkpoint [0-9]+ for 
job" ${TIMEOUT} || e
 wait_for_status flinkdep/flink-example-statemachine 
'.status.jobManagerDeploymentStatus' READY ${TIMEOUT} || exit 1
 wait_for_status flinkdep/flink-example-statemachine '.status.jobStatus.state' 
RUNNING ${TIMEOUT} || exit 1
 
-check_operator_log_for_errors '|grep -v "REST service in session cluster timed 
out"' || exit 1
-
 echo "Successfully run the Flink Kubernetes application HA test"
 
diff --git a/e2e-tests/test_application_operations.sh 
b/e2e-tests/test_application_operations.sh
index d69da980..22e2d179 100755
--- a/e2e-tests/test_application_operations.sh
+++ b/e2e-tests/test_application_operations.sh
@@ -67,6 +67,4 @@ wait_for_status flinkdep/flink-example-statemachine 
'.status.jobManagerDeploymen
 wait_for_status flinkdep/flink-example-statemachine '.status.jobStatus.state' 
RUNNING ${TIMEOUT} || exit 1
 assert_available_slots 1 $CLUSTER_ID
 
-check_operator_log_for_errors || exit 1
-
 echo "Successfully run the last-state upgrade test"
diff --git a/e2e-tests/test_autoscaler.sh b/e2e-tests/test_autoscaler.sh
index 49767d64..4afa952b 100644
--- a/e2e-tests/test_autoscaler.sh
+++ b/e2e-tests/test_autoscaler.sh
@@ -48,6 +48,4 @@ else
 fi
 wait_for_status $APPLICATION_IDENTIFIER '.status.lifecycleState' STABLE 
${TIMEOUT} || exit 1
 
-check_operator_log_for_errors || exit 1
-
 echo "Successfully run the autoscaler test"
diff --git a/e2e-tests/test_multi_sessionjob.sh 
b/e2e-tests/test_multi_sessionjob.sh
index 09862db5..59990870 100755
--- a/e2e-tests/test_multi_sessionjob.sh
+++ b/e2e-tests/test_multi_sessionjob.sh
@@ -38,7 +38,6 @@ jm_pod_name=$(get_jm_pod_name $CLUSTER_ID)
 wait_for_logs $jm_pod_name "Completed checkpoint [0-9]+ for job" ${TIMEOUT} || 
exit 1
 wait_for_status $SESSION_CLUSTER_IDENTIFIER 
'.status.jobManagerDeploymentStatus' READY ${TIMEOUT} || exit 1
 wait_for_status $SESSION_JOB_IDENTIFIER '.status.jobStatus.state' RUNNING 
${TIMEOUT} || exit 1
-check_operator_log_for_errors || exit 1
 echo "Flink Session Job is running properly"
 
 # Current namespace: flink
@@ -49,5 +48,4 @@ jm_pod_name=$(get_jm_pod_name $CLUSTER_ID)
 wait_for_logs $jm_pod_name "Completed checkpoint [0-9]+ for job" ${TIMEOUT} || 
exit 1
 wait_for_status $SESSION_CLUSTER_IDENTIFIER 
'.status.jobManagerDeploymentStatus' READY ${TIMEOUT} || exit 1
 wait_for_status $SESSION_JOB_IDENTIFIER '.status.jobStatus.state' RUNNING 
${TIMEOUT} || exit 1
-check_operator_log_for_errors || exit 1
 echo "Flink Session Job is running properly"
diff --git a/e2e-tests/test_sessionjob_kubernetes_ha.sh 
b/e2e-tests/test_sessionjob_kubernetes_ha.sh
index 37c8c37e..0ad55b12 100755
--- a/e2e-tests/test_sessionjob_kubernetes_ha.sh
+++ b/e2e-tests/test_sessionjob_kubernetes_ha.sh
@@ -48,7 +48,5 @@ wait_for_logs $jm_pod_name "Completed checkpoint [0-9]+ for 
job" ${TIMEOUT} || e
 wait_for_status $SESSION_CLUSTER_IDENTIFIER 
'.status.jobManagerDeploymentStatus' READY ${TIMEOUT} || exit 1
 wait_for_status $SESSION_JOB_IDENTIFIER '.status.jobStatus.state' RUNNING 
${TIMEOUT} || exit 1
 
-check_operator_log_for_errors '|grep -v "REST service in session cluster timed 
out"' || exit 1
-
 echo "Successfully run the Flink Session Job HA test"
 
diff --git a/e2e-tests/test_sessionjob_operations.sh 
b/e2e-tests/test_sessionjob_operations.sh
index c230af8c..b1c88fc2 100755
--- a/e2e-tests/test_sessionjob_operations.sh
+++ b/e2e-tests/test_sessionjob_operations.sh
@@ -79,5 +79,3 @@ wait_for_jobmanager_running $CLUSTER_ID $TIMEOUT
 wait_for_logs $jm_pod_name "Completed checkpoint [0-9]+ for job" ${TIMEOUT} || 
exit 1
 wait_for_status $SESSION_CLUSTER_IDENTIFIER 
'.status.jobManagerDeploymentStatus' READY ${TIMEOUT} || exit 1
 wait_for_status $SESSION_JOB_IDENTIFIER '.status.jobStatus.state' RUNNING 
${TIMEOUT} || exit 1
-
-check_operator_log_for_errors || exit 1
diff --git a/e2e-tests/utils.sh b/e2e-tests/utils.sh
index 7f5513c5..e3f5b741 100755
--- a/e2e-tests/utils.sh
+++ b/e2e-tests/utils.sh
@@ -184,37 +184,6 @@ function patch_flink_config() {
   kubectl patch cm flink-operator-config -n "${operator_pod_namespace}" --type 
merge -p "${patch}"
 }
 
-function check_operator_log_for_errors {
-  local ignore=$1
-  echo "Checking for operator log errors..."
-  #https://issues.apache.org/jira/browse/FLINK-30310
-  echo "Error checking is temporarily turned off."
-  return 0
-
-  operator_pod_namespace=$(get_operator_pod_namespace)
-  operator_pod_name=$(get_operator_pod_name)
-  echo "Operator namespace: ${operator_pod_namespace} pod: 
${operator_pod_name}"
-
-  local cmd="kubectl logs -n ${operator_pod_namespace} ${operator_pod_name}
-    | grep -e '\[\s*ERROR\s*\]'
-    | grep -v 'Failed to submit a listener notification task' 
`#https://issues.apache.org/jira/browse/FLINK-30147`
-    | grep -v 'Failed to submit job to session cluster' 
`#https://issues.apache.org/jira/browse/FLINK-30148`
-    | grep -v 'Error during event processing' 
`#https://issues.apache.org/jira/browse/FLINK-30149`
-    | grep -v 'Error while patching status' 
`#https://issues.apache.org/jira/browse/FLINK-30283`
-    ${ignore}"
-
-  echo "Filter command: ${cmd}"
-  errors=$(eval ${cmd} || true)
-
-  if [ -z "${errors}" ]; then
-    echo "No errors in log files."
-    return 0
-  else
-    echo -e "Found error in log files.\n\n${errors}"
-    return 1
-  fi
-}
-
 function debug_and_show_logs {
     echo "Debugging failed e2e test:"
     echo "Currently existing Kubernetes resources"

Reply via email to