fix: Crash before starting on OpenBSD #1421

Merged
Jade merged 2 commits from katie/continuwuity:openbsd into main 2026-02-20 13:36:09 +00:00
Contributor

This calculates the max number of senders using core count only when we actually know how many cores there are.

core_affinity doesn't return any cores on OpenBSD, so otherwise we try to clamp(1, 0), which blows up when the bounds are asserted.

A better fix would be adding OpenBSD support to that crate, but that seems hard and still only fixes one unsupported platform.

I also thought about updating available_parallelism instead to never return zero, but the cause of the issue is the odd "conservative" bound and how it's used, so this seemed like a better place to put it. That function is used in other places as well, and I didn't want to introduce weird side effects.

  • This pull request targets the main branch, and the branch is named something other than
    main.
  • I have written an appropriate pull request title and my description is clear.
  • I understand I am responsible for the contents of this pull request.
  • I have followed the contributing guidelines:
This calculates the max number of senders using core count only when we actually know how many cores there are. core_affinity doesn't return any cores on OpenBSD, so otherwise we try to `clamp(1, 0)`, which blows up when the bounds are asserted. A better fix would be adding OpenBSD support to that crate, but that seems hard and still only fixes one unsupported platform. I also thought about updating `available_parallelism` instead to never return zero, but the cause of the issue is the odd "conservative" bound and how it's used, so this seemed like a better place to put it. That function is used in other places as well, and I didn't want to introduce weird side effects. <!-- In order to help reviewers know what your pull request does at a glance, you should ensure that 1. Your PR title is a short, single sentence describing what you changed 2. You have described in more detail what you have changed, why you have changed it, what the intended effect is, and why you think this will be beneficial to the project. If you have made any potentially strange/questionable design choices, but didn't feel they'd benefit from code comments, please don't mention them here - after opening your pull request, go to "files changed", and click on the "+" symbol in the line number gutter, and attach comments to the lines that you think would benefit from some clarification. --> <!-- Example: This pull request allows us to warp through time and space ten times faster than before by double-inverting the warp drive with hyperheated jump fluid, both making the drive faster and more efficient. This resolves the common issue where we have to wait more than 10 milliseconds to engage, use, and disengage the warp drive when travelling between galaxies. --> <!-- Closes: #... --> <!-- Fixes: #... --> <!-- Uncomment the above line(s) if your pull request fixes an issue or closes another pull request by superseding it. Replace `#...` with the issue/pr number, such as `#123`. --> <!-- You need to complete these before your PR can be considered. If you aren't sure about some, feel free to ask for clarification in #dev:continuwuity.org. --> - [x] This pull request targets the `main` branch, and the branch is named something other than `main`. - [x] I have written an appropriate pull request title and my description is clear. - [x] I understand I am responsible for the contents of this pull request. - I have followed the [contributing guidelines][c1]: - [x] My contribution follows the [code style][c2], if applicable. - [x] I ran [pre-commit checks][c1pc] before opening/drafting this pull request. - [x] I have [tested my contribution][c1t] (or proof-read it for documentation-only changes) myself, if applicable. This includes ensuring code compiles. - [x] My commit messages follow the [commit message format][c1cm] and are descriptive. - [x] I have written a [news fragment][n1] for this PR, if applicable<!--(can be done after hitting open!)-->. <!-- Notes on these requirements: - While not required, we encourage you to sign your commits with GPG or SSH to attest the authenticity of your changes. - While we allow LLM-assisted contributions, we do not appreciate contributions that are low quality, which is typical of machine-generated contributions that have not had a lot of love and care from a human. Please do not open a PR if all you have done is asked ChatGPT to tidy up the codebase with a +-100,000 diff. - In the case of code style violations, reviewers may leave review comments/change requests indicating what the ideal change would look like. For example, a reviewer may suggest you lower a log level, or use `match` instead of `if/else` etc. - In the case of code style violations, pre-commit check failures, minor things like typos/spelling errors, and in some cases commit format violations, reviewers may modify your branch directly, typically by making changes and adding a commit. Particularly in the latter case, a reviewer may rebase your commits to squash "spammy" ones (like "fix", "fix", "actually fix"), and reword commit messages that don't satisfy the format. - Pull requests MUST pass the `Checks` CI workflows to be capable of being merged. This can only be bypassed in exceptional circumstances. If your CI flakes, let us know in matrix:r/dev:continuwuity.org. - Pull requests have to be based on the latest `main` commit before being merged. If the main branch changes while you're making your changes, you should make sure you rebase on main before opening a PR. Your branch will be rebased on main before it is merged if it has fallen behind. - We typically only do fast-forward merges, so your entire commit log will be included. Once in main, it's difficult to get out cleanly, so put on your best dress, smile for the cameras! --> [c1]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md [c2]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/docs/development/code_style.mdx [c1pc]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#pre-commit-checks [c1t]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#running-tests-locally [c1cm]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#commit-messages [n1]: https://towncrier.readthedocs.io/en/stable/tutorial.html#creating-news-fragments
fix: Crash before starting on OpenBSD
Some checks are pending
Documentation / Build and Deploy Documentation (pull_request) Blocked by required conditions
Checks / Prek / Pre-commit & Formatting (pull_request) Blocked by required conditions
Checks / Prek / Clippy and Cargo Tests (pull_request) Blocked by required conditions
02bec04209
core_affinity doesn't return any cores on OpenBSD, so we try to
clamp(1, 0). This is Less Good than fixing that crate, but at
least allows the server to start up.
docs: Add news fragment
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 5m7s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 37m32s
416d0b57c9
ginger approved these changes 2026-02-19 18:54:57 +00:00
nex requested changes 2026-02-19 21:50:21 +00:00
Dismissed
nex left a comment
Owner

Looks good, I just think the news fragment could be clearer

Looks good, I just think the news fragment could be clearer
@ -0,0 +1 @@
Fixed a crash on startup when running on OpenBSD. Contributed by @katie.
Owner

This is quite generic and will lose context when it makes its way into the changelog. I'd suggest describing the specific conditions that caused the crash.

This is quite generic and will lose context when it makes its way into the changelog. I'd suggest describing the specific conditions that caused the crash.
katie marked this conversation as resolved
katie force-pushed openbsd from 416d0b57c9
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 5m7s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 37m32s
to d558700b48
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Update flake hashes / update-flake-hashes (pull_request) Successful in 23s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m54s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 15m9s
2026-02-20 09:32:28 +00:00
Compare
katie force-pushed openbsd from d558700b48
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Update flake hashes / update-flake-hashes (pull_request) Successful in 23s
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m54s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 15m9s
to efd879fcd8
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m45s
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 14m59s
Documentation / Build and Deploy Documentation (push) Successful in 2m45s
Checks / Prek / Pre-commit & Formatting (push) Successful in 4m41s
Release Docker Image / Build linux-arm64 (release) (push) Successful in 7m11s
Checks / Prek / Clippy and Cargo Tests (push) Successful in 15m2s
Release Docker Image / Build linux-amd64 (release) (push) Successful in 14m25s
Release Docker Image / Create Multi-arch Release Manifest (push) Successful in 22s
Release Docker Image / Build linux-amd64 (max-perf) (push) Successful in 4m0s
Release Docker Image / Build linux-arm64 (max-perf) (push) Successful in 4m17s
Release Docker Image / Create Max-Perf Manifest (push) Successful in 20s
2026-02-20 10:13:56 +00:00
Compare
Jade merged commit efd879fcd8 into main 2026-02-20 13:36:09 +00:00
ginger added this to the next milestone 2026-02-20 14:10:14 +00:00
nex approved these changes 2026-02-20 16:06:30 +00:00
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
continuwuation/continuwuity!1421
No description provided.