Skip to content

Fix xharness watchdog process cleanup in apple and android runners #16637

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

Open
akoeplinger wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix xharness watchdog process cleanup in apple and android runners #16637

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
13 changes: 11 additions & 2 deletions src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-helix-job.android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@ function report_infrastructure_failure() {
}

# Act out the actual commands (and time constrain them to create buffer for the end of this script)
source command.sh & PID=$! ; (sleep "$command_timeout" && kill -s 0 $PID > /dev/null 2>&1 && echo "ERROR: WORKLOAD TIMED OUT - Killing user command.." && kill $PID 2> /dev/null & ) ; wait $PID
# shellcheck disable=SC1091
source command.sh &
COMMAND_PID=$!
sleep "$command_timeout" && kill -s 0 $COMMAND_PID > /dev/null 2>&1 && echo "ERROR: WORKLOAD TIMED OUT - Killing user command.." && kill $COMMAND_PID 2> /dev/null &
WATCHDOG_PID=$!
wait $COMMAND_PID
exit_code=$?
# Kill the watchdog process (and its sleeping child) now that the command has finished
kill $WATCHDOG_PID 2> /dev/null
wait $WATCHDOG_PID 2> /dev/null

exit $?
exit $exit_code
9 changes: 8 additions & 1 deletion src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/xharness-runner.apple.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,15 @@ start_time="$(date '+%Y-%m-%d %H:%M:%S')"

# Act out the actual commands (and time constrain them to create buffer for the end of this script)
# shellcheck disable=SC1091
source command.sh & PID=$! ; (sleep "$command_timeout" && kill -s 0 $PID > /dev/null 2>&1 && echo "ERROR: WORKLOAD TIMED OUT - Killing user command.." && kill $PID 2> /dev/null & ) ; wait $PID
source command.sh &
COMMAND_PID=$!
sleep "$command_timeout" && kill -s 0 $COMMAND_PID > /dev/null 2>&1 && echo "ERROR: WORKLOAD TIMED OUT - Killing user command.." && kill $COMMAND_PID 2> /dev/null &
WATCHDOG_PID=$!
wait $COMMAND_PID
exit_code=$?
# Kill the watchdog process (and its sleeping child) now that the command has finished
kill $WATCHDOG_PID 2> /dev/null
wait $WATCHDOG_PID 2> /dev/null

# In case of issues, include the syslog (last 2 MB from the time this work item has been running)
if [ $exit_code -ne 0 ]; then
Expand Down
Loading