Use /proc/partitions to get device names

SaveTheRbtz · SaveTheRbtz · commit 1a4509dd0645 · 2021-05-05T10:48:36.000-07:00
Signed-off-by: Alexey Ivanov &lt;rbtz@dropbox.com&gt;
diff --git a/blkio.go b/blkio.go
@@ -130,7 +130,7 @@ func (b *blkioController) Stat(path string, stats *v1.Metrics) error {
 		}
 	}
 
-	f, err := os.Open(filepath.Join(b.procRoot, "diskstats"))
+	f, err := os.Open(filepath.Join(b.procRoot, "partitions"))
 	if err != nil {
 		return err
 	}
@@ -335,7 +335,10 @@ func getDevices(r io.Reader) (map[deviceKey]string, error) {
 		s       = bufio.NewScanner(r)
 		devices = make(map[deviceKey]string)
 	)
-	for s.Scan() {
+	for i := 0; s.Scan(); i++ {
+		if i < 2 {
+			continue
+		}
 		fields := strings.Fields(s.Text())
 		major, err := strconv.Atoi(fields[0])
 		if err != nil {
@@ -352,7 +355,7 @@ func getDevices(r io.Reader) (map[deviceKey]string, error) {
 		if _, ok := devices[key]; ok {
 			continue
 		}
-		devices[key] = filepath.Join("/dev", fields[2])
+		devices[key] = filepath.Join("/dev", fields[3])
 	}
 	return devices, s.Err()
 }
diff --git a/blkio_test.go b/blkio_test.go
@@ -24,32 +24,38 @@ import (
 	v1 "github.com/containerd/cgroups/stats/v1"
 )
 
-const data = `   7       0 loop0 0 0 0 0 0 0 0 0 0 0 0
-   7       1 loop1 0 0 0 0 0 0 0 0 0 0 0
-   7       2 loop2 0 0 0 0 0 0 0 0 0 0 0
-   7       3 loop3 0 0 0 0 0 0 0 0 0 0 0
-   7       4 loop4 0 0 0 0 0 0 0 0 0 0 0
-   7       5 loop5 0 0 0 0 0 0 0 0 0 0 0
-   7       6 loop6 0 0 0 0 0 0 0 0 0 0 0
-   7       7 loop7 0 0 0 0 0 0 0 0 0 0 0
-   8       0 sda 1892042 187697 63489222 1246284 1389086 2887005 134903104 11390608 1 1068060 12692228
-   8       1 sda1 1762875 37086 61241570 1200512 1270037 2444415 131214808 11152764 1 882624 12409308
-   8       2 sda2 2 0 4 0 0 0 0 0 0 0 0
-   8       5 sda5 129102 150611 2244440 45716 18447 442590 3688296 67268 0 62584 112984`
+const data = `major minor  #blocks  name
+
+   7        0          4 loop0
+   7        1     163456 loop1
+   7        2     149616 loop2
+   7        3     147684 loop3
+   7        4     122572 loop4
+   7        5       8936 loop5
+   7        6      31464 loop6
+   7        7     182432 loop7
+ 259        0  937692504 nvme0n1
+ 259        1      31744 nvme0n1p1
+`
 
 func TestGetDevices(t *testing.T) {
 	r := strings.NewReader(data)
 	devices, err := getDevices(r)
 	if err != nil {
 		t.Fatal(err)
 	}
-	name, ok := devices[deviceKey{8, 0}]
-	if !ok {
-		t.Fatal("no device found for 8,0")
-	}
-	const expected = "/dev/sda"
-	if name != expected {
-		t.Fatalf("expected device name %q but received %q", expected, name)
+	for dev, expected := range map[deviceKey]string{
+		deviceKey{7, 0}: "/dev/loop0",
+		deviceKey{259, 0}: "/dev/nvme0n1",
+		deviceKey{259, 1}: "/dev/nvme0n1p1",
+	} {
+		name, ok := devices[dev]
+		if !ok {
+			t.Fatalf("no device found for %d:%d", dev.major, dev.minor)
+		}
+		if name != expected {
+			t.Fatalf("expected device name %q but received %q", expected, name)
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func (b blkioController) Stat(path string, stats v1.Metrics) error {`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`		`- f, err := os.Open(filepath.Join(b.procRoot, "diskstats"))`
	`133`	`+ f, err := os.Open(filepath.Join(b.procRoot, "partitions"))`
`134`	`134`	`if err != nil {`
`135`	`135`	`return err`
`136`	`136`	`}`
`@@ -335,7 +335,10 @@ func getDevices(r io.Reader) (map[deviceKey]string, error) {`
`335`	`335`	`s = bufio.NewScanner(r)`
`336`	`336`	`devices = make(map[deviceKey]string)`
`337`	`337`	`)`
`338`		`- for s.Scan() {`
	`338`	`+ for i := 0; s.Scan(); i++ {`
	`339`	`+ if i < 2 {`
	`340`	`+ continue`
	`341`	`+ }`
`339`	`342`	`fields := strings.Fields(s.Text())`
`340`	`343`	`major, err := strconv.Atoi(fields[0])`
`341`	`344`	`if err != nil {`
`@@ -352,7 +355,7 @@ func getDevices(r io.Reader) (map[deviceKey]string, error) {`
`352`	`355`	`if _, ok := devices[key]; ok {`
`353`	`356`	`continue`
`354`	`357`	`}`
`355`		`- devices[key] = filepath.Join("/dev", fields[2])`
	`358`	`+ devices[key] = filepath.Join("/dev", fields[3])`
`356`	`359`	`}`
`357`	`360`	`return devices, s.Err()`
`358`	`361`	`}`