Moving swap options into ResourceRequirements instead of ContainerSpecs#2816
Merged
anshulpundir merged 2 commits intomoby:masterfrom Feb 7, 2019
Merged
Moving swap options into ResourceRequirements instead of ContainerSpecs#2816anshulpundir merged 2 commits intomoby:masterfrom
ResourceRequirements instead of ContainerSpecs#2816anshulpundir merged 2 commits intomoby:masterfrom
Conversation
…Spec`s It has been decided when discussing moby/moby#37872 that swap options should progressively be moved to existing structs meant to limit resource usage, and that the new field for swap should hold the swap size itself, instead of the swap size + the memory. This patch is a pre-req to unblock moby/moby#37872 in the light of the new design. Removing the 2 fields from `ContainerSpec` proto messages shouldn't be an issue as these were never used in practice. Signed-off-by: Jean Rouge <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #2816 +/- ##
==========================================
- Coverage 61.95% 61.94% -0.01%
==========================================
Files 137 137
Lines 22107 22107
==========================================
- Hits 13696 13694 -2
- Misses 6938 6939 +1
- Partials 1473 1474 +1 |
Contributor
Author
|
@thaJeztah : just to double check before I update moby/moby#37872 accordingly, is this in accordance with what we discussed on there? Thank you :) ! |
Member
|
Sorry for the delayed response, I was on PTO for some days; adding this to today's maintainers meeting to double check 👍 |
Contributor
Author
|
Discussed in moby's maintainers' meetings, and looks good to people there. @anshulpundir @dperny could you please have a look? Thanks! |
anshulpundir
suggested changes
Feb 7, 2019
Signed-off-by: Jean Rouge <[email protected]>
anshulpundir
approved these changes
Feb 7, 2019
Contributor
Author
|
Thanks! |
wk8
added a commit
to wk8/moby
that referenced
this pull request
Mar 14, 2019
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 6, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 7, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 7, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 8, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 8, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 8, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 9, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 9, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 9, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 9, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 9, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 9, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 9, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 9, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 13, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 17, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 17, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 17, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
dperny
pushed a commit
to dperny/docker
that referenced
this pull request
Oct 20, 2025
With integration tests Relevant Swarmkit PR: moby/swarmkit#2816 (updated the vendored version of Swarkit to that) Signed-off-by: Jean Rouge <[email protected]> Updated for latest master, fixed bitrot. Signed-off-by: Drew Erny <[email protected]>
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
3 participants
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.
It has been decided when discussing moby/moby#37872
that swap options should progressively be moved to existing structs
meant to limit resource usage, and that the new field for swap should hold
the swap size itself, instead of the swap size + the memory.
This patch is a pre-req to unblock moby/moby#37872
in the light of the new design.
Removing the 2 fields from
ContainerSpecproto messages shouldn't be anissue as these were never used in practice.