-
Notifications
You must be signed in to change notification settings - Fork 40k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Copy ParseCgroupFileUnified and Drop rest of containerd/cgroups
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
- Loading branch information
Showing
43 changed files
with
116 additions
and
11,024 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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,64 @@ | ||
| /* | ||
| Copyright 2024 The Kubernetes 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 cgroups | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "strings" | ||
| ) | ||
|
|
||
| // ParseCgroupFileUnified returns legacy subsystem paths as the first value, | ||
| // and returns the unified path as the second value. | ||
| func ParseCgroupFileUnified(path string) (map[string]string, string, error) { | ||
| f, err := os.Open(path) | ||
| if err != nil { | ||
| return nil, "", err | ||
| } | ||
| defer f.Close() | ||
| return parseCgroupFromReaderUnified(f) | ||
| } | ||
|
|
||
| func parseCgroupFromReaderUnified(r io.Reader) (map[string]string, string, error) { | ||
| var ( | ||
| cgroups = make(map[string]string) | ||
| unified = "" | ||
| s = bufio.NewScanner(r) | ||
| ) | ||
| for s.Scan() { | ||
| var ( | ||
| text = s.Text() | ||
| parts = strings.SplitN(text, ":", 3) | ||
| ) | ||
| if len(parts) < 3 { | ||
| return nil, unified, fmt.Errorf("invalid cgroup entry: %q", text) | ||
| } | ||
| for _, subs := range strings.Split(parts[1], ",") { | ||
| if subs == "" { | ||
| unified = parts[2] | ||
| } else { | ||
| cgroups[subs] = parts[2] | ||
| } | ||
| } | ||
| } | ||
| if err := s.Err(); err != nil { | ||
| return nil, unified, err | ||
| } | ||
| return cgroups, unified, nil | ||
| } |
This file contains 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,50 @@ | ||
| /* | ||
| 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 cgroups | ||
|
|
||
| import ( | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestParseCgroupFromReaderUnified(t *testing.T) { | ||
| const data = `10:devices:/user.slice | ||
| 9:net_cls,net_prio:/ | ||
| 8:blkio:/ | ||
| 7:freezer:/ | ||
| 6:perf_event:/ | ||
| 5:cpuset:/ | ||
| 4:memory:/ | ||
| 3:pids:/user.slice/user-1000.slice/user@1000.service | ||
| 2:cpu,cpuacct:/ | ||
| 1:name=systemd:/user.slice/user-1000.slice/user@1000.service/gnome-terminal-server.service | ||
| 0::/user.slice/user-1000.slice/user@1000.service/gnome-terminal-server.service` | ||
| r := strings.NewReader(data) | ||
| paths, unified, err := parseCgroupFromReaderUnified(r) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| for subsystem, path := range paths { | ||
| if subsystem == "" { | ||
| t.Fatalf("empty subsystem for %q", path) | ||
| } | ||
| } | ||
| unifiedExpected := "/user.slice/user-1000.slice/user@1000.service/gnome-terminal-server.service" | ||
| if unified != unifiedExpected { | ||
| t.Fatalf("expected %q, got %q", unifiedExpected, unified) | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.