Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Eliminate race conditions and remove DATAROOT last in cleanup #2893

Merged
merged 3 commits into from
Sep 6, 2024
Merged

Eliminate race conditions and remove DATAROOT last in cleanup #2893

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0a632f
Wait to delete DATAROOT until the end of the cleanup job
DavidHuber-NOAA Sep 5, 2024
b502db3
Add -ignore_readdir_race to find to prevent errors if a file has alre…
DavidHuber-NOAA Sep 5, 2024
36e664d
Update scripts/exglobal_cleanup.sh
DavidHuber-NOAA Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions scripts/exglobal_cleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ DATAfcst="${DATAROOT}/${RUN}fcst.${PDY:-}${cyc}"
if [[ -d "${DATAfcst}" ]]; then rm -rf "${DATAfcst}"; fi
#DATAefcs="${DATAROOT}/${RUN}efcs???${PDY:-}${cyc}"
rm -rf "${DATAROOT}/${RUN}efcs"*"${PDY:-}${cyc}"

# In XML, DATAROOT is defined as:
#DATAROOT="${STMP}/RUNDIRS/${PSLOT}/${RUN}.${PDY}${cyc}"
# cleanup is only executed after the entire cycle is successfully completed.
# removing DATAROOT should be possible if that is the case.
rm -rf "${DATAROOT}"

echo "Cleanup ${DATAROOT} completed!"
###############################################################

if [[ "${CLEANUP_COM:-YES}" == NO ]] ; then
Expand Down Expand Up @@ -49,10 +41,10 @@ function remove_files() {
find_exclude_string="${find_exclude_string[*]/%-or}"
# Remove all regular files that do not match
# shellcheck disable=SC2086
find "${directory}" -type f -not \( ${find_exclude_string} \) -delete
find "${directory}" -type f -not \( ${find_exclude_string} \) -ignore_readdir_race -delete
# Remove all symlinks that do not match
# shellcheck disable=SC2086
find "${directory}" -type l -not \( ${find_exclude_string} \) -delete
find "${directory}" -type l -not \( ${find_exclude_string} \) -ignore_readdir_race -delete
# Remove any empty directories
find "${directory}" -type d -empty -delete
}
Expand Down Expand Up @@ -113,3 +105,16 @@ if (( GDATE < RDATE )); then
fi
deletion_target="${ROTDIR}/${RUN}.${RDATE:0:8}"
if [[ -d ${deletion_target} ]]; then rm -rf "${deletion_target}"; fi

# sync and wait to avoid filesystem synchronization issues
sync && sleep 1

# Finally, delete DATAROOT.
DavidHuber-NOAA marked this conversation as resolved.
Show resolved Hide resolved
# This will also delete the working directory, so save it until the end.
# In XML, DATAROOT is defined as:
#DATAROOT="${STMP}/RUNDIRS/${PSLOT}/${RUN}.${PDY}${cyc}"
# cleanup is only executed after the entire cycle is successfully completed.
# removing DATAROOT should be possible if that is the case.
rm -rf "${DATAROOT}"

echo "Cleanup ${DATAROOT} completed!"
Loading