Merge pull request #668 from mrc0mmand/dont-ignore-sd-executor-coredumps

common: don't blanket-ignore sd-executor coredumps

agent/testsuite-alt.sh

@@ -29,6 +29,9 @@ if ! coredumpctl_init; then
     exit 1
 fi
 
+# Collect any coredumps that happened during boot
+exectask "coredumpctl_collect_boot" "coredumpctl_collect"
+
 centos_ensure_qemu_symlink
 
 # Since we don't install the built revision in this case, let's copy some files
@@ -80,6 +83,9 @@ exectask "ninja-test_sanitizers_$(uname -m)" "meson test -C $BUILD_DIR --print-e
 exectask "check-meson-logs-for-sanitizer-errors" "cat $BUILD_DIR/meson-logs/testlog*.txt | check_for_sanitizer_errors"
 [[ -d "$BUILD_DIR/meson-logs" ]] && rsync -amq --include '*.txt' --include '*/' --exclude '*' "$BUILD_DIR/meson-logs" "$LOGDIR"
 
+# Ignore any coredumps generated by unit tests, as there's a lot of intentional crashes
+coredumpctl_set_ts
+
 export QEMU_BIN="/bin/qemu-system-$(uname -m)"
 # Set timeouts for QEMU and nspawn tests to kill them in case they get stuck
 export QEMU_TIMEOUT=1200

agent/testsuite.sh

@@ -32,6 +32,9 @@ if ! coredumpctl_init; then
     exit 1
 fi
 
+# Collect any coredumps that happened during boot
+exectask "coredumpctl_collect_boot" "coredumpctl_collect"
+
 centos_ensure_qemu_symlink
 
 set +e
@@ -53,6 +56,9 @@ if ! git diff --quiet "$MAIN_BRANCH" HEAD && ! git diff "$(git merge-base "$MAIN
     finish_and_exit
 fi
 
+# Ignore any coredumps generated by unit tests, as there's a lot of intentional crashes
+coredumpctl_set_ts
+
 ## Integration test suite ##
 CHECK_LIST=()
 FLAKE_LIST=(

common/utils.sh

@@ -8,6 +8,14 @@ set -u
 __COREDUMPCTL_TS=""
 # Keep a map of test-specific excludes to avoid code duplication
 declare -Arx COREDUMPCTL_EXCLUDE_MAP=(
+    # test-execute - certain subtests die with SIGSEGV intentionally
+    # systemd-executor - there's a couple of instances where test-execute blocks exec
+    #                    syscalls through a seccomp filter which then kills the test
+    #                    with SIGSYS, and with systemd/systemd#27890 the coredump
+    #                    executable will be set to the new systemd-executor binary
+    # python3.x - one of the test-execute subtests triggers SIGSYS in python3.x
+    #             (since systemd/systemd#16675)
+    ["test/TEST-02-UNITTESTS"]="/(bin/python3.[0-9]+|platform-python3.[0-9]+|systemd-executor|test-execute)$"
     ["test/TEST-17-UDEV"]="/(sleep|udevadm)$"
     ["test/TEST-59-RELOADING-RESTART"]="/(sleep|bash|systemd-notify)$"
 )
@@ -297,7 +305,7 @@ coredumpctl_init() {
 #
 #   $1: timestamp to set. If empty, the current date & time is used instead
 coredumpctl_set_ts() {
-    __COREDUMPCTL_TS="${1:-$(date +"%Y-%m-%d %H:%M:%S")}"
+    __COREDUMPCTL_TS="$(date +"%Y-%m-%d %H:%M:%S")"
 }
 
 # Attempt to dump info about relevant coredumps using the coredumpctl utility.
@@ -350,20 +358,13 @@ coredumpctl_collect() {
     # The filter can be overridden using the $COREDUMPCTL_EXCLUDE_RX env variable.
     # See also the $COREDUMPCTL_EXCLUDE_MAP at the beginning of this file.
     # EXCLUDE_RX:
-    #   test-execute - certain subtests die with SIGSEGV intentionally
     #   dhcpcd - [temporary] keeps crashing intermittently with SIGABRT, needs
     #            further investigation
-    #   python3.x - one of the test-execute subtests triggers SIGSYS in python3.x
-    #               (since systemd/systemd#16675)
     #   sleep/bash - intentional SIGABRT caused by TEST-57
     #   systemd-notify - intermittent (and intentional) SIGABRT caused by TEST-59
     #   auditd - bug in C8S
     #   test(-usr)?-dump - intentional coredumps from systemd-coredump tests in TEST-74
-    #   systemd-executor - there's a couple of instances where test-execute blocks exec
-    #                      syscalls through a seccomp filter which then kills the test
-    #                      with SIGSYS, and with systemd/systemd#27890 the coredump
-    #                      executable will be set to the new systemd-executor binary
-    local exclude_rx="${COREDUMPCTL_EXCLUDE_RX:-/(test-execute|dhcpcd|bin/python3.[0-9]+|platform-python3.[0-9]+|bash|sleep|systemd-notify|auditd|test(-usr)?-dump|systemd-executor)$}"
+    local exclude_rx="${COREDUMPCTL_EXCLUDE_RX:-/(dhcpcd|bash|sleep|systemd-notify|auditd|test(-usr)?-dump)$}"
     _log "Excluding coredumps matching '$exclude_rx'"
     if ! "$coredumpctl_bin" "${args[@]}" -F COREDUMP_EXE | grep -Ev "$exclude_rx" > "$tempfile"; then
         _log "No relevant coredumps found"
@@ -380,7 +381,7 @@ coredumpctl_collect() {
     # trace and other useful info
     while read -r path; do
         local exe
-        local gdb_cmd="bt full"
+        local gdb_cmd="set print pretty on\nbt full"
 
         _log "Collecting coredumps for '$path'"
         "$coredumpctl_bin" "${args[@]}" info "$path"

vagrant/test_scripts/test-arch-coverage.sh

@@ -34,6 +34,9 @@ if ! coredumpctl_init; then
     exit 1
 fi
 
+# Collect any coredumps that happened during boot
+exectask "coredumpctl_collect_boot" "coredumpctl_collect"
+
 # Disable swap, since it seems to cause CPU soft lock-ups in some cases
 swapoff -av
 
@@ -49,6 +52,9 @@ exectask "ninja-test" "GCOV_ERROR_FILE=$LOGDIR/ninja-test-gcov-errors.log meson
 exectask "lcov_collect-build_dir-ninja-test" "lcov_collect $COVERAGE_DIR/unit-tests.coverage-info $BUILD_DIR"
 [[ -d "$BUILD_DIR/meson-logs" ]] && rsync -amq --include '*.txt' --include '*/' --exclude '*' "$BUILD_DIR/meson-logs" "$LOGDIR"
 
+# Ignore any coredumps generated by unit tests, as there's a lot of intentional crashes
+coredumpctl_set_ts
+
 ## Integration test suite ##
 # Prepare a custom-tailored initrd image (with the systemd module included).
 # This is necessary, as the default mkinitcpio config includes only the udev module,

vagrant/test_scripts/test-arch-sanitizers-clang.sh

@@ -23,6 +23,15 @@ export COREDUMPCTL_BIN="$BUILD_DIR/coredumpctl"
 
 bootctl status
 
+# Enable systemd-coredump
+if ! coredumpctl_init; then
+    echo >&2 "Failed to configure systemd-coredump/coredumpctl"
+    exit 1
+fi
+
+# Collect any coredumps that happened during boot
+exectask "coredumpctl_collect_boot" "coredumpctl_collect"
+
 pushd /build || { echo >&2 "Can't pushd to /build"; exit 1; }
 
 ## Sanitizer-specific options
@@ -43,6 +52,9 @@ exectask "ninja-test_sanitizers" "meson test -C $BUILD_DIR --print-errorlogs --t
 exectask "check-meson-logs-for-sanitizer-errors" "cat $BUILD_DIR/meson-logs/testlog*.txt | check_for_sanitizer_errors"
 [[ -d "$BUILD_DIR/meson-logs" ]] && rsync -amq --include '*.txt' --include '*/' --exclude '*' "$BUILD_DIR/meson-logs" "$LOGDIR"
 
+# Ignore any coredumps generated by unit tests, as there's a lot of intentional crashes
+coredumpctl_set_ts
+
 ## Run TEST-01-BASIC under sanitizers
 # Prepare a custom-tailored initrd image (with the systemd module included).
 # This is necessary, as the default mkinitcpio config includes only the udev module,

vagrant/test_scripts/test-arch.sh

@@ -28,6 +28,9 @@ if ! coredumpctl_init; then
     exit 1
 fi
 
+# Collect any coredumps that happened during boot
+exectask "coredumpctl_collect_boot" "coredumpctl_collect"
+
 # Disable swap, since it seems to cause CPU soft lock-ups in some cases
 swapoff -av
 
@@ -37,6 +40,9 @@ pushd /build || { echo >&2 "Can't pushd to /build"; exit 1; }
 exectask "ninja-test" "meson test -C $BUILD_DIR --print-errorlogs --timeout-multiplier=3"
 [[ -d "$BUILD_DIR/meson-logs" ]] && rsync -amq --include '*.txt' --include '*/' --exclude '*' "$BUILD_DIR/meson-logs" "$LOGDIR"
 
+# Ignore any coredumps generated by unit tests, as there's a lot of intentional crashes
+coredumpctl_set_ts
+
 ## Integration test suite ##
 # Prepare a custom-tailored initrd image (with the systemd module included).
 # This is necessary, as the default mkinitcpio config includes only the udev module,