Skip to content

Commit f203a42

Browse files
authored
Owls 103821 - Check for a marker file in the emptyDir to detect if aux image init has already completed (#3595)
* OWLS-103821 - Fix for MII AI fails to restart after k8s shutdown and restarted.
1 parent aad763a commit f203a42

File tree

1 file changed

+26
-18
lines changed

1 file changed

+26
-18
lines changed

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

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,36 @@ UNKNOWN_SHELL=true
3333
checkEnv AUXILIARY_IMAGE_TARGET_PATH AUXILIARY_IMAGE_CONTAINER_NAME || exit 1
3434

3535
if [[ "$AUXILIARY_IMAGE_CONTAINER_NAME" == "operator-aux-container"* ]]; then
36-
initAuxiliaryImage > /tmp/auxiliaryImage.out 2>&1
37-
retval=$?
38-
cat /tmp/auxiliaryImage.out
39-
40-
mkdir -p ${AUXILIARY_IMAGE_TARGET_PATH}/auxiliaryImageLogs
41-
cp /tmp/auxiliaryImage.out ${AUXILIARY_IMAGE_TARGET_PATH}/auxiliaryImageLogs/${AUXILIARY_IMAGE_CONTAINER_NAME}.out
4236
sucFile="${AUXILIARY_IMAGE_TARGET_PATH}/auxiliaryImageLogs/${AUXILIARY_IMAGE_CONTAINER_NAME}.suc"
43-
rm -f "$sucFile"
44-
if [ $retval -eq 0 ]; then
45-
echo $retval > "$sucFile"
37+
if [ ! -f $sucFile ]; then
38+
initAuxiliaryImage > /tmp/auxiliaryImage.out 2>&1
39+
retval=$?
40+
cat /tmp/auxiliaryImage.out
41+
42+
mkdir -p ${AUXILIARY_IMAGE_TARGET_PATH}/auxiliaryImageLogs
43+
cp /tmp/auxiliaryImage.out ${AUXILIARY_IMAGE_TARGET_PATH}/auxiliaryImageLogs/${AUXILIARY_IMAGE_CONTAINER_NAME}.out
44+
rm -f "$sucFile"
45+
if [ $retval -eq 0 ]; then
46+
echo $retval > "$sucFile"
47+
fi
48+
else
49+
trace FINE "Auxiliary Image: Skipping initialization due to a previous successful initialization."
4650
fi
4751
elif [[ "$AUXILIARY_IMAGE_CONTAINER_NAME" == "compatibility-mode-operator-aux-container"* ]]; then
48-
initCompatibilityModeInitContainersWithLegacyAuxImages > /tmp/compatibilityModeInitContainers.out 2>&1
49-
retval=$?
50-
cat /tmp/compatibilityModeInitContainers.out
51-
52-
mkdir -p "${AUXILIARY_IMAGE_TARGET_PATH}/${AUXILIARY_IMAGE_COMMAND_LOGS_DIR}"
53-
cp /tmp/compatibilityModeInitContainers.out "${AUXILIARY_IMAGE_TARGET_PATH}/${AUXILIARY_IMAGE_COMMAND_LOGS_DIR}/${AUXILIARY_IMAGE_CONTAINER_NAME}.out"
5452
sucFile="${AUXILIARY_IMAGE_TARGET_PATH}/${AUXILIARY_IMAGE_COMMAND_LOGS_DIR}/${AUXILIARY_IMAGE_CONTAINER_NAME}.suc"
55-
rm -f "$sucFile"
56-
if [ $retval -eq 0 ]; then
57-
echo $retval > "$sucFile"
53+
if [ ! -f $sucFile ]; then
54+
initCompatibilityModeInitContainersWithLegacyAuxImages > /tmp/compatibilityModeInitContainers.out 2>&1
55+
retval=$?
56+
cat /tmp/compatibilityModeInitContainers.out
57+
58+
mkdir -p "${AUXILIARY_IMAGE_TARGET_PATH}/${AUXILIARY_IMAGE_COMMAND_LOGS_DIR}"
59+
cp /tmp/compatibilityModeInitContainers.out "${AUXILIARY_IMAGE_TARGET_PATH}/${AUXILIARY_IMAGE_COMMAND_LOGS_DIR}/${AUXILIARY_IMAGE_CONTAINER_NAME}.out"
60+
rm -f "$sucFile"
61+
if [ $retval -eq 0 ]; then
62+
echo $retval > "$sucFile"
63+
fi
64+
else
65+
trace FINE "Auxiliary Image: Skipping initialization due to a previous successful initialization."
5866
fi
5967
else
6068
trace SEVERE "Invalid auxiliary image container name '$AUXILIARY_IMAGE_CONTAINER_NAME'. " \

0 commit comments

Comments
 (0)