Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion node/disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"k8s.io/klog/v2"
)

var blockDevice = regexp.MustCompile(`^(dm-\d+|(s|h|xv|v)d[a-z]|md\d+|nvme\d+n\d+|rbd\d+)`)
var blockDevice = regexp.MustCompile(`^(dm-\d+|(s|h|xv|v)d[a-z]|md\d+|mmcblk\d+|nvme\d+n\d+|rbd\d+)`)

type DevStat struct {
Name string
Expand Down
2 changes: 1 addition & 1 deletion node/disk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestGetNodeDisks(t *testing.T) {
}

assert.Equal(t,
[]string{"dm-0", "md1", "nvme0n1", "nvme1n1", "rbd0", "rbd1", "sda", "sdb", "vda", "xvda"},
[]string{"dm-0", "md1", "mmcblk1", "mmcblk2", "nvme0n1", "nvme1n1", "rbd0", "rbd1", "sda", "sdb", "vda", "xvda"},
names(d.BlockDevices()),
)
}
4 changes: 3 additions & 1 deletion node/fixtures/diskstats
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@
252 0 dm-0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
2 0 fd0 0 0 0 0 0 0 0 0 0 0 0
251 0 rbd0 216 0 8642 82 1355 2670 107408 6863 0 6228 6946 0 0 0 0 0 0
251 16 rbd1 121 0 4474 167 1070 2045 97928 4940 0 4664 5107 0 0 0 0 0 0
251 16 rbd1 121 0 4474 167 1070 2045 97928 4940 0 4664 5107 0 0 0 0 0 0
179 0 mmcblk2 1507813 57817 41091023 964555 22224580 788926 129513803 19667753 0 11731380 25835227 0 0 0 0 7614434 5202918
179 24 mmcblk1 144 0 7784 338 0 0 0 0 0 260 338 0 0 0 0 0 0