Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

config-linux: Drop redundant 'blkio' prefix from blockIO properties #860

Merged
merged 1 commit into from
Jun 1, 2017

Conversation

wking
Copy link
Contributor

@wking wking commented May 25, 2017

These are long enough without the prefix, and linux.resources.blockIO.blkioWeight, etc. are just as specific as linux.resources.blockIO.weight. Generated with:

$ sed -i s/blkioWeight/weight/g $(git grep -l blkioWeight)
$ sed -i s/blkioLeaf/leaf/g $(git grep -l blkioLeaf)
$ sed -i s/blkioThrottle/throttle/g $(git grep -l blkioThrottle)

Property-name polishing inspired by #859, in case we want to clean this sort of thing up before 1.0. If not, we can just close this PR.

@hqhq
Copy link
Contributor

hqhq commented May 30, 2017

I tend to keep them close to cgroup APIs, so +1 for closing this PR.

@wking
Copy link
Contributor Author

wking commented May 30, 2017 via email

@wking
Copy link
Contributor Author

wking commented May 31, 2017

If we want this before 2.0, it needs to go in the 1.0.0 milestone. If we don't want this before 2.0, and are ok with the currently-inconsistent controller-prefixing, then maintainers should close this issue with a note to that effect.

The current maintainer comment seems to be in favor of controller-prefixing, and if we want to do that consistently (we don't at the moment, currently only for the blkio* properties), then updating the other properties to include controller-prefixing would also have to happen before 1.0 if we want it to happen before 2.0.

These are long enough without the prefix, and
linux.resources.blockIO.blkioWeight, etc. are just as specific as
linux.resources.blockIO.weight.

Generated with:

  $ sed -i s/blkioWeight/weight/g $(git grep -l blkioWeight)
  $ sed -i s/blkioLeaf/leaf/g $(git grep -l blkioLeaf)
  $ sed -i s/blkioThrottle/throttle/g $(git grep -l blkioThrottle)

Signed-off-by: W. Trevor King <wking@tremily.us>
@wking
Copy link
Contributor Author

wking commented Jun 1, 2017

Rebased around #846 with a70bd8fd8ca338.

@crosbymichael
Copy link
Member

crosbymichael commented Jun 1, 2017

LGTM

Approved with PullApprove

1 similar comment
@mrunalp
Copy link
Contributor

mrunalp commented Jun 1, 2017

LGTM

Approved with PullApprove

@crosbymichael crosbymichael merged commit c8fec52 into opencontainers:master Jun 1, 2017
@wking wking deleted the remove-redundant-blkio branch June 2, 2017 04:19
@vbatts vbatts mentioned this pull request Jul 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants