whitelisting Ceph disks (/dev/rbdX)

coroot · Mar 25, 2022 · f02d005 · f02d005
1 parent 75b8ae3
commit f02d005
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/node/disk.go b/node/disk.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 )
 
-var blockDevice = regexp.MustCompile(`^(dm-\d+|(s|h|xv|v)d[a-z]|md\d+|nvme\d+n\d+)`)
+var blockDevice = regexp.MustCompile(`^(dm-\d+|(s|h|xv|v)d[a-z]|md\d+|nvme\d+n\d+|rbd\d+)`)
 
 type DevStat struct {
 	Name             string

diff --git a/node/disk_test.go b/node/disk_test.go
@@ -47,7 +47,7 @@ func TestGetNodeDisks(t *testing.T) {
 	}
 
 	assert.Equal(t,
-		[]string{"dm-0", "md1", "nvme0n1", "nvme1n1", "sda", "sdb", "vda", "xvda"},
+		[]string{"dm-0", "md1", "nvme0n1", "nvme1n1", "rbd0", "rbd1", "sda", "sdb", "vda", "xvda"},
 		names(d.BlockDevices()),
 	)
 }
diff --git a/node/fixtures/diskstats b/node/fixtures/diskstats
@@ -22,4 +22,6 @@
  111       0 xvda 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
  111       1 xvda1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
  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
+   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