Skip to content

Commit

Permalink
Merge pull request #1158 from kolyshkin/check-before-update
Browse files Browse the repository at this point in the history
config-linux: add memory.checkBeforeUpdate
  • Loading branch information
kolyshkin authored Sep 9, 2022
2 parents cbb84be + 9e658bc commit 494a5a6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 1 deletion.
5 changes: 5 additions & 0 deletions config-linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,11 @@ The following properties do not specify memory limits, but are covered by the `m
To disable it, specify a value of `true`.
* **`useHierarchy`** *(bool, OPTIONAL)* - enables or disables hierarchical memory accounting.
If enabled (`true`), child cgroups will share the memory limits of this cgroup.
* **`checkBeforeUpdate`** *(bool, OPTIONAL)* - enables container memory usage check before setting a new limit.
If enabled (`true`), runtime MAY check if a new memory limit is lower than the current usage, and MUST
reject the new limit. Practically, when cgroup v1 is used, the kernel rejects the limit lower than the
current usage, and when cgroup v2 is used, an OOM killer is invoked. This setting can be used on
cgroup v2 to mimic the cgroup v1 behavior.

#### Example

Expand Down
3 changes: 3 additions & 0 deletions schema/config-linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@
},
"useHierarchy": {
"type": "boolean"
},
"checkBeforeUpdate": {
"type": "boolean"
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion schema/test/config/good/spec-example.json
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,8 @@
"kernelTCP": -1,
"swappiness": 0,
"disableOOMKiller": false,
"useHierarchy": false
"useHierarchy": false,
"checkBeforeUpdate": false
},
"cpu": {
"shares": 1024,
Expand Down
4 changes: 4 additions & 0 deletions specs-go/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,10 @@ type LinuxMemory struct {
DisableOOMKiller *bool `json:"disableOOMKiller,omitempty"`
// Enables hierarchical memory accounting
UseHierarchy *bool `json:"useHierarchy,omitempty"`
// CheckBeforeUpdate enables checking if a new memory limit is lower
// than the current usage during update, and if so, rejecting the new
// limit.
CheckBeforeUpdate *bool `json:"checkBeforeUpdate,omitempty"`
}

// LinuxCPU for Linux cgroup 'cpu' resource management
Expand Down

0 comments on commit 494a5a6

Please sign in to comment.