Unbreak swap facts on OpenBSD #58155
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
requested review from
In doing so it turns out swap_total was also broken on OpenBSD.
The output of `swapctl` is not identical between NetBSD and OpenBSD,
which resulted in a crashing minion:
File "/usr/local/lib/python3.8/site-packages/salt/grains/core.py", line 534, in _bsd_memdata
grains["swap_total"] = int(swap_total) // 1024 // 1024
ValueError: invalid literal for int() with base 10: 'no'
While here remove unneeded salt.utils.path.which() call for swapctl as it's always installed as /sbin/swapctl
jasperla
force-pushed
the
openbsd_no_swap
branch
from
52a3c64
to
869b4a4
Compare
|
Let's close this, I have lost all interest so it's not fair to keep this open any longer. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
It fixes two issues:
swap_totalfact was broken for systems which did have swap as it was divided by 1024 too many.Previous Behavior
Minion crash or incorrect
swap_total.New Behavior
No more crash and correct
swap_total.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes