Repository navigation
Conversation
When memory and memorySwap are set to the same value (i.e. swap is disabled), ConvertMemorySwapToCgroupV2Value returns 0. The fs2 driver special-cases this and writes 0 to memory.swap.max, but the systemd driver only sets MemorySwapMax if swap != 0, treating explicit zero the same as unset. As a result, the unit's MemorySwapMax stays at infinity, and the next systemctl daemon-reload resets memory.swap.max back to max, silently re-enabling swap for the container. Set MemorySwapMax=0 in this case, same as fs2 does, and add a test. Fixes: opencontainers#74 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
When memory and memorySwap are set to the same value (i.e. swap is
disabled),
ConvertMemorySwapToCgroupV2Valuereturns 0. The fs2 driverspecial-cases this and writes 0 to
memory.swap.max, but the systemddriver only sets
MemorySwapMaxifswap != 0, treating explicit zerothe same as unset.
As a result, the unit's
MemorySwapMaxstays atinfinity, and the nextsystemctl daemon-reloadresetsmemory.swap.maxback tomax, silentlyre-enabling swap for the container.
Set
MemorySwapMax=0in this case, same as fs2 does, and add a test(which fails without the fix).
Fixes: #74