From fe99cb71349f83e2d18000827b03afb31c1b6a2a Mon Sep 17 00:00:00 2001 From: Saad Khan Date: Fri, 15 Dec 2023 18:21:55 +0530 Subject: [PATCH] update test file and handled the null case Signed-off-by: Saad Khan --- .../com/autotune/database/service/ExperimentDBService.java | 4 +++- .../remote_monitoring_fault_tolerant_tests.sh | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/autotune/database/service/ExperimentDBService.java b/src/main/java/com/autotune/database/service/ExperimentDBService.java index 7a2422ac8..6d594deae 100644 --- a/src/main/java/com/autotune/database/service/ExperimentDBService.java +++ b/src/main/java/com/autotune/database/service/ExperimentDBService.java @@ -90,7 +90,9 @@ public void loadAllResults(Map mainKruizeExperimentMap) th List resultDataList = new ArrayList<>(); for (UpdateResultsAPIObject updateResultsAPIObject : updateResultsAPIObjects) { try { - ExperimentResultData experimentResultData = Converters.KruizeObjectConverters.convertUpdateResultsAPIObjToExperimentResultData(updateResultsAPIObject); + ExperimentResultData experimentResultData = null; + if (updateResultsAPIObject.getKruizeObject() != null) + experimentResultData = Converters.KruizeObjectConverters.convertUpdateResultsAPIObjToExperimentResultData(updateResultsAPIObject); if (experimentResultData != null) resultDataList.add(experimentResultData); else diff --git a/tests/scripts/remote_monitoring_tests/fault_tolerant_tests/remote_monitoring_fault_tolerant_tests.sh b/tests/scripts/remote_monitoring_tests/fault_tolerant_tests/remote_monitoring_fault_tolerant_tests.sh index 220ea6a2e..b881413bb 100755 --- a/tests/scripts/remote_monitoring_tests/fault_tolerant_tests/remote_monitoring_fault_tolerant_tests.sh +++ b/tests/scripts/remote_monitoring_tests/fault_tolerant_tests/remote_monitoring_fault_tolerant_tests.sh @@ -152,13 +152,13 @@ echo "" echo "Running fault tolerant test for kruize on ${CLUSTER_TYPE}" | tee -a ${LOG} if [ "${CLUSTER_TYPE}" == "openshift" ]; then echo "python3 kruize_pod_restart_test.py -c ${CLUSTER_TYPE} -a ${SERVER_IP_ADDR} -u ${num_exps} -d ${iterations} -r ${LOG_DIR} | tee -a ${TEST_LOG}" | tee -a ${LOG} - python3 kruize_pod_restart_test.py -c ${CLUSTER_TYPE} -a ${SERVER_IP_ADDR} -u ${num_exps} -d ${iterations} -r "${LOG_DIR}" + python3 kruize_pod_restart_test.py -c ${CLUSTER_TYPE} -a ${SERVER_IP_ADDR} -u ${num_exps} -d ${iterations} -r "${LOG_DIR}" | tee -a ${TEST_LOG} exit_code=$? echo "exit_code = $exit_code" else echo "python3 kruize_pod_restart_test.py -c ${CLUSTER_TYPE} -u ${num_exps} -d ${iterations} -r ${LOG_DIR} | tee -a ${TEST_LOG}" | tee -a ${LOG} - python3 kruize_pod_restart_test.py -c ${CLUSTER_TYPE} -u ${num_exps} -d ${iterations} -r "${LOG_DIR}" + python3 kruize_pod_restart_test.py -c ${CLUSTER_TYPE} -u ${num_exps} -d ${iterations} -r "${LOG_DIR}" | tee -a ${TEST_LOG} exit_code=$? echo "exit_code = $exit_code" fi @@ -174,7 +174,7 @@ if [ "${exit_code}" -ne 0 ]; then echo "Fault tolerant test failed! Check the log for details" | tee -a ${LOG} exit 1 else - if [[ $(grep -i "error\|exception" ${KRUIZE_POD_LOG_BEFORE}) || $(grep -i "error\|exception" ${KRUIZE_POD_LOG_AFTER}) ]]; then + if [[ $(grep -i "ERROR" ${KRUIZE_POD_LOG_BEFORE}) || $(grep -i "error\|exception" ${KRUIZE_POD_LOG_AFTER}) ]]; then echo "Fault tolerant test failed! Check the logs for details" | tee -a ${LOG} exit 1 else