Fix handling of "r_limits" in Podman REST API /libpod/containers/create #25986
Conversation
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
openshift-ci
bot
added
release-note
do-not-merge/work-in-progress
github-actions
bot
added
the
kind/api-change
Honny1
force-pushed
the
fix-unlimited-ulimits
branch
2 times, most recently
from
af78d7b to
828297d
Compare
|
[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore. |
Honny1
force-pushed
the
fix-unlimited-ulimits
branch
5 times, most recently
from
6d4ad5a to
c932678
Compare
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
Luap99
reviewed
Apr 28, 2025
Comment on lines
63
to
84
| var input map[string]interface{} | ||
| if err := decoder.Decode(&input); err != nil { | ||
| utils.Error(w, http.StatusInternalServerError, fmt.Errorf("decode(): %w", err)) | ||
| return | ||
| } | ||
|
|
||
| rLimits := []specs.POSIXRlimit{} | ||
| if rLimitsInput, ok := input["r_limits"].([]interface{}); ok { | ||
| if rLimits, err = parseRLimits(rLimitsInput); err != nil { | ||
| utils.Error(w, http.StatusBadRequest, fmt.Errorf("invalid rlimit: %w", err)) | ||
| return | ||
| } | ||
| delete(input, "r_limits") | ||
| } | ||
|
|
||
| inputJSON, err := json.Marshal(input) | ||
| if err != nil { | ||
| utils.Error(w, http.StatusInternalServerError, fmt.Errorf("marshal(): %w", err)) | ||
| return | ||
| } | ||
|
|
||
| if err := json.Unmarshal(inputJSON, &sg); err != nil { |
There was a problem hiding this comment.
json unmarshal/marshal is not exactly fast and now we add the overhead of another cycle to each container creation.
I have no tested it but could we use something like
type specgentmp struct {
specgen.SpecGenerator
Rlimits []spec.POSIXRlimit `json:"r_limits,omitempty"` //change the type to something you can directly unmarshel -1 into.
}
Then use that convert from the Rlimits overwrite type to the real POSIXRlimit type and assign that back to the specgen type and then you can use the proper specgen type I think.
There was a problem hiding this comment.
It's working. Thank you, it's a very nice and elegant solution.
The JSON decoder correctly cannot decode (overflow) negative values (e.g., `-1`) for fields of type `uint64`, as `-1` is used to represent `max` in `POSIXRlimit`. To handle this, we use `tmpSpecGenerator` to decode the request body. The `tmpSpecGenerator` replaces the `POSIXRlimit` type with a `tmpRlimit` type that uses the `json.Number` type for decoding values. The `tmpRlimit` is then converted into the `POSIXRlimit` type and assigned to the `SpecGenerator`. This approach ensures compatibility with the Podman CLI and remote API, which already handle `-1` by casting it to `uint64` (`uint64(-1)` equals `MaxUint64`) to signify `max`. Fixes: https://issues.redhat.com/browse/RUN-2859 Fixes: containers#24886 Signed-off-by: Jan Rodák <hony.com@seznam.cz>
Honny1
force-pushed
the
fix-unlimited-ulimits
branch
from
c932678 to
e66ff39
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Honny1, Luap99 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
neat! LGTM |
|
LGTM |
|
/lgtm |
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.
The JSON decoder correctly cannot decode (overflow) negative values (e.g.,
-1) for fields of typeuint64, as-1is used to representmaxinPOSIXRlimit. To handle this, the request body is first decoded into a map to process ther_limitsfield separately. Logic has been added to parse thesoftandhardlimits, casting-1touint64to representmaxwhile rejecting other invalid negative values.This approach ensures compatibility with the Podman CLI and remote API, which already handle
-1by casting it touint64(uint64(-1)equalsMaxUint64) to signifymax.Fixes: https://issues.redhat.com/browse/RUN-2859
Fixes: #24886
Does this PR introduce a user-facing change?