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

runtime-config-linux: Convert classID from hex to uint32 

The just-landed style conventions prefer integers to hex strings [1],
and I said I'd post an update for this setting if/when those landed
[2].  The kernel uses uint32s for this setting [3].

[1]: https://github.com/opencontainers/specs/pull/287
[2]: https://github.com/opencontainers/specs/pull/287#discussion_r48899312
[3]: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/include/net/cls_cgroup.h?id=refs/tags/v4.3#n24

Signed-off-by: W. Trevor King <wking@tremily.us>
This commit is contained in:
W. Trevor King 2016-01-08 10:54:25 -08:00
parent 6aa53edc9b
commit 5a960a478d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime-config-linux.md
View File

@ -378,7 +378,7 @@ For more information, see [the net\_cls cgroup man page](https://www.kernel.org/
The following parameters can be specified to setup these cgroup controllers: The following parameters can be specified to setup these cgroup controllers:
* **`classID`** *(string, optional)* - is the network class identifier the cgroup's network packets will be tagged with * **`classID`** *(uint32, optional)* - is the network class identifier the cgroup's network packets will be tagged with
* **`priorities`** *(array, optional)* - specifies a list of objects of the priorities assigned to traffic originating from * **`priorities`** *(array, optional)* - specifies a list of objects of the priorities assigned to traffic originating from
processes in the group and egressing the system on various interfaces. The following parameters can be specified per-priority: processes in the group and egressing the system on various interfaces. The following parameters can be specified per-priority:
@ -389,7 +389,7 @@ processes in the group and egressing the system on various interfaces. The follo
```json ```json
"network": { "network": {
"classID": "0x100001", "classID": 1048577,
"priorities": [ "priorities": [
{ {
"name": "eth0", "name": "eth0",

4
runtime_config_linux.go
View File

@ -191,9 +191,7 @@ type Pids struct {
// Network identification and priority configuration // Network identification and priority configuration
type Network struct { type Network struct {
// Set class identifier for container's network packets // Set class identifier for container's network packets
// this is actually a string instead of a uint64 to overcome the json ClassID *uint32 `json:"classID"`
// limitation of specifying hex numbers
ClassID string `json:"classID"`
// Set priority of network traffic for container // Set priority of network traffic for container
Priorities []InterfacePriority `json:"priorities"` Priorities []InterfacePriority `json:"priorities"`
} }