jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #788 from darrenstahlmsft/RemoveReservation 

Remove Memory reservation on Windows
This commit is contained in:
Qiang Huang 2017-05-09 09:55:14 +08:00 committed by GitHub
parent d42f1eb741 aaed975b55
commit 101e6f9d5c
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config-windows.md
View File

@ -15,16 +15,13 @@ The following parameters can be specified:
* **`limit`** *(uint64, OPTIONAL)* - sets limit of memory usage in bytes. * **`limit`** *(uint64, OPTIONAL)* - sets limit of memory usage in bytes.
* **`reservation`** *(uint64, OPTIONAL)* - sets the guaranteed minimum amount of memory for a container in bytes.
#### Example #### Example
```json ```json
"windows": { "windows": {
"resources": { "resources": {
"memory": { "memory": {
"limit": 2097152, "limit": 2097152
"reservation": 524288
} }
} }
} }

4
schema/config-windows.json
View File

@ -15,10 +15,6 @@
"limit": { "limit": {
"id": "https://opencontainers.org/schema/bundle/windows/resources/memory/limit", "id": "https://opencontainers.org/schema/bundle/windows/resources/memory/limit",
"$ref": "defs.json#/definitions/uint64" "$ref": "defs.json#/definitions/uint64"
},
"reservation": {
"id": "https://opencontainers.org/schema/bundle/windows/resources/memory/reservation",
"$ref": "defs.json#/definitions/uint64"
} }
} }
}, },

2
specs-go/config.go
View File

@ -450,8 +450,6 @@ type WindowsResources struct {
type WindowsMemoryResources struct { type WindowsMemoryResources struct {
// Memory limit in bytes. // Memory limit in bytes.
Limit *uint64 `json:"limit,omitempty"` Limit *uint64 `json:"limit,omitempty"`
// Memory reservation in bytes.
Reservation *uint64 `json:"reservation,omitempty"`
} }
// WindowsCPUResources contains CPU resource management settings. // WindowsCPUResources contains CPU resource management settings.