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

TEMPORARY(?) instrumentation for unlinkat-ebusy #18653

Merged
merged 1 commit into from
May 23, 2023
Merged

TEMPORARY(?) instrumentation for unlinkat-ebusy #18653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions contrib/cirrus/timestamp.awk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
BEGIN {
STARTTIME=systime()
printf "[%s] START", strftime("%T")
printf " - All [+xxxx] lines that follow are relative to %s.\n", strftime("%FT%T")
printf " - All [+xxxx] lines that follow are relative to %s.\n", strftime("%FT%TZ", systime(), 1)
}

{
Expand All @@ -16,5 +16,5 @@ BEGIN {

END {
printf "[%s] END", strftime("%T")
printf " - [%+05ds] total duration since %s\n", systime()-STARTTIME, strftime("%FT%T")
printf " - [%+05ds] total duration since %s\n", systime()-STARTTIME, strftime("%FT%TZ", systime(), 1)
}
24 changes: 23 additions & 1 deletion test/system/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ fi

# Setup helper: establish a test environment with exactly the images needed
function basic_setup() {
# FIXME FIXME FIXME: remove if #17216 is fixed. See below also.
if [[ -e "${BATS_SUITE_TMPDIR}/forget-it" ]]; then
skip "everything is hosed, no point in going on"
fi

# Clean up all containers
run_podman rm -t 0 --all --force --ignore

Expand All @@ -58,7 +63,24 @@ function basic_setup() {

# Clean up all images except those desired
found_needed_image=
run_podman images --all --format '{{.Repository}}:{{.Tag}} {{.ID}}'
run_podman '?' images --all --format '{{.Repository}}:{{.Tag}} {{.ID}}'
# FIXME FIXME FIXME: temporary hack for #17216. If we see the unlinkat-busy
# flake, nothing will ever work again.
if [[ $status -ne 0 ]]; then
if [[ "$output" =~ unlinkat.*busy ]]; then
# Signal (see above) to skip all subsequent tests.
touch "${BATS_SUITE_TMPDIR}/forget-it"
# Gather some debugging info, then fail
echo "$_LOG_PROMPT ps auxww --forest"
ps auxww --forest
echo "$_LOG_PROMPT mount"
mount
echo "$_LOG_PROMPT lsof /var/lib/containers"
lsof /var/lib/containers
false
fi
fi

for line in "${lines[@]}"; do
set $line
if [[ "$1" == "$PODMAN_TEST_IMAGE_FQN" ]]; then
Expand Down