-
Notifications
You must be signed in to change notification settings - Fork 251
Simpler v2 cgroup interface #109
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| example/example | ||
| cmd/cgctl |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| /* | ||
| Copyright The containerd Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
|
|
||
| v2 "github.com/containerd/cgroups/v2" | ||
| "github.com/sirupsen/logrus" | ||
| "github.com/urfave/cli" | ||
| ) | ||
|
|
||
| func main() { | ||
| app := cli.NewApp() | ||
| app.Name = "cgctl" | ||
| app.Version = "1" | ||
| app.Usage = "cgroup v2 management tool" | ||
| app.Flags = []cli.Flag{ | ||
| cli.BoolFlag{ | ||
| Name: "debug", | ||
| Usage: "enable debug output in the logs", | ||
| }, | ||
| cli.StringFlag{ | ||
| Name: "mountpoint", | ||
| Usage: "cgroup mountpoint", | ||
| Value: "/sys/fs/cgroup", | ||
| }, | ||
| } | ||
| app.Commands = []cli.Command{ | ||
| newCommand, | ||
| delCommand, | ||
| listCommand, | ||
| statCommand, | ||
| } | ||
| app.Before = func(clix *cli.Context) error { | ||
| if clix.GlobalBool("debug") { | ||
| logrus.SetLevel(logrus.DebugLevel) | ||
| } | ||
| return nil | ||
| } | ||
| if err := app.Run(os.Args); err != nil { | ||
| fmt.Fprintln(os.Stderr, err) | ||
| os.Exit(1) | ||
| } | ||
| } | ||
|
|
||
| var newCommand = cli.Command{ | ||
| Name: "new", | ||
| Usage: "create a new cgroup", | ||
| Flags: []cli.Flag{ | ||
| cli.BoolFlag{ | ||
| Name: "enable", | ||
| Usage: "enable the controllers for the group", | ||
| }, | ||
| }, | ||
| Action: func(clix *cli.Context) error { | ||
| path := clix.Args().First() | ||
| c, err := v2.NewManager(clix.GlobalString("mountpoint"), path, nil) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if clix.Bool("enable") { | ||
| controllers, err := c.ListControllers() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if err := c.ToggleControllers(controllers, v2.Enable); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| var delCommand = cli.Command{ | ||
| Name: "del", | ||
| Usage: "delete a cgroup", | ||
| Action: func(clix *cli.Context) error { | ||
| path := clix.Args().First() | ||
| c, err := v2.LoadManager(clix.GlobalString("mountpoint"), path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return c.Delete() | ||
| }, | ||
| } | ||
|
|
||
| var listCommand = cli.Command{ | ||
| Name: "list", | ||
| Usage: "list processes in a cgroup", | ||
| Action: func(clix *cli.Context) error { | ||
| path := clix.Args().First() | ||
| c, err := v2.LoadManager(clix.GlobalString("mountpoint"), path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| procs, err := c.Procs(true) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| for _, p := range procs { | ||
| fmt.Println(p) | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| var statCommand = cli.Command{ | ||
| Name: "stat", | ||
| Usage: "stat a cgroup", | ||
| Action: func(clix *cli.Context) error { | ||
| path := clix.Args().First() | ||
| c, err := v2.LoadManager(clix.GlobalString("mountpoint"), path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| stats, err := c.Stat() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| for k, v := range stats { | ||
| fmt.Printf("%s->%d\n", k, v) | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be done for the parent group?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you don't need to enable this at all if the system is setup to enable them
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When you have
cpuin the top group/sys/fs/cgroup,cpuis enabled for/sys/fs/cgroup/foo, but not enabled for/sys/fs/cgroup/foo/bar.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, its up to the creator of the cgroup to enable these. I don't think the sub cgroup should modify the parent settings