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.

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

watchdog: open /dev/watchdog0 only if it exists #24664

Merged
merged 1 commit into from Sep 16, 2022
Merged

Conversation

yuwata
Copy link
Member

@yuwata yuwata commented Sep 13, 2022

Fixes #24661.

@bluca
Copy link
Member

bluca commented Sep 14, 2022

@mrc0mmand vagrant looks sad today:

23:06:24 cp: cannot stat '/root/systemd/vagrant-*': No such file or directory
23:06:24 cp: cannot stat '/tmp/vagrant-*-console.log': No such file or directory
23:06:24 2022-09-13 22:06:24,474 [agent-control/fetch_artifacts] INFO: Fetching artifacts from node n27-5-5.pool.ci.centos.org: (remote: ~/vagrant-logs*, local: ./artifacts_wqqfuldt)
23:06:24 2022-09-13 22:06:24,474 [agent-control/execute_local_command] INFO: Executing a LOCAL command: /usr/bin/scp -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@n27-5-5.pool.ci.centos.org:~/vagrant-logs* ./artifacts_wqqfuldt
23:06:24 2022-09-13 22:06:24,643 [agent-control/main] ERROR: Execution failed
23:06:24 Traceback (most recent call last):
23:06:24   File "./agent-control.py", line 403, in main
23:06:24     ac.execute_remote_command(command, artifacts_dir="~/vagrant-logs*")
23:06:24   File "./agent-control.py", line 164, in execute_remote_command
23:06:24     raise RuntimeError("Remote command exited with an unexpected return code "
23:06:24 RuntimeError: Remote command exited with an unexpected return code (got: 1, expected: 0), bailing out

@mrc0mmand
Copy link
Member

@mrc0mmand vagrant looks sad today:

23:06:24 cp: cannot stat '/root/systemd/vagrant-*': No such file or directory
23:06:24 cp: cannot stat '/tmp/vagrant-*-console.log': No such file or directory
23:06:24 2022-09-13 22:06:24,474 [agent-control/fetch_artifacts] INFO: Fetching artifacts from node n27-5-5.pool.ci.centos.org: (remote: ~/vagrant-logs*, local: ./artifacts_wqqfuldt)
23:06:24 2022-09-13 22:06:24,474 [agent-control/execute_local_command] INFO: Executing a LOCAL command: /usr/bin/scp -r -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@n27-5-5.pool.ci.centos.org:~/vagrant-logs* ./artifacts_wqqfuldt
23:06:24 2022-09-13 22:06:24,643 [agent-control/main] ERROR: Execution failed
23:06:24 Traceback (most recent call last):
23:06:24   File "./agent-control.py", line 403, in main
23:06:24     ac.execute_remote_command(command, artifacts_dir="~/vagrant-logs*")
23:06:24   File "./agent-control.py", line 164, in execute_remote_command
23:06:24     raise RuntimeError("Remote command exited with an unexpected return code "
23:06:24 RuntimeError: Remote command exited with an unexpected return code (got: 1, expected: 0), bailing out

Whoops, I forgot to reschedule this one. I have this issue on my TODO list with a possible solution, hopefully will have a fix ready soon, thanks for the ping.

@bluca
Copy link
Member

bluca commented Sep 14, 2022

/dev/watchdog0 should exist on all supported kernel versions, let's wait for the reporter to provide more information

@poettering poettering added the reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks label Sep 16, 2022
@yuwata yuwata added please-review and removed reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks labels Sep 16, 2022
@yuwata
Copy link
Member Author

yuwata commented Sep 16, 2022

Applied the suggestion. PTAL.

src/shared/watchdog.c Outdated Show resolved Hide resolved
@poettering poettering added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed please-review labels Sep 16, 2022
@yuwata yuwata merged commit ab8e646 into systemd:main Sep 16, 2022
41 of 45 checks passed
@yuwata yuwata deleted the watchdog branch September 16, 2022 15:18
@yuwata yuwata added needs-stable-backport and removed good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed labels Sep 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants