Skip to content

Commit 594895e

Browse files
committed
OWLS-94812 - Fix for auxiliary image error after the main container crashes and restarts.
1 parent 58d47dc commit 594895e

File tree

1 file changed

+1
-2
lines changed
  • operator/src/main/resources/scripts

1 file changed

+1
-2
lines changed

operator/src/main/resources/scripts/utils.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ function checkAuxiliaryImage() {
722722
rm -f ${AUXILIARY_IMAGE_PATH}/testaccess.tmp || return 1
723723

724724
# The container .out files embed their container name, the names will sort in the same order in which the containers ran
725-
out_files=$(set -o pipefail ; ls -1 $AUXILIARY_IMAGE_PATH/auxiliaryImageLogs/*.out 2>&1 | sort --version-sort) \
725+
out_files=$(set -o pipefail ; ls -1 $AUXILIARY_IMAGE_PATH/auxiliaryImageLogs/*.out > /dev/null 2>&1 | sort --version-sort) \
726726
|| (trace SEVERE "Auxiliary Image: Assertion failure. No files found in '$AUXILIARY_IMAGE_PATH/auxiliaryImageLogs/*.out" \
727727
&& return 1)
728728
severe_found=false
@@ -742,7 +742,6 @@ function checkAuxiliaryImage() {
742742
trace "Auxiliary Image: End of '${out_file}' contents"
743743
done
744744
[ "${severe_found}" = "true" ] && return 1
745-
rm -fr $AUXILIARY_IMAGE_PATH/auxiliaryImageLogs
746745
[ -z "$(ls -A $AUXILIARY_IMAGE_PATH)" ] \
747746
&& trace SEVERE "Auxiliary Image: No files found in '$AUXILIARY_IMAGE_PATH'. " \
748747
"Do your auxiliary images have files in their '$AUXILIARY_IMAGE_PATH' directories? " \

0 commit comments

Comments
 (0)