feat(crd): enhance the details stored on BD when the device has zpool (#643)

Signed-off-by: liuminjian <liuminjian@d-uni.com>
Co-authored-by: liuminjian <liuminjian@chinatelecom.cn>

Author: liuminjian

cmd/ndm_daemonset/controller/controller.go

@@ -73,6 +73,8 @@ const (
 	NDMDeviceTypeKey = "ndm.io/blockdevice-type"
 	// NDMManagedKey specifies blockdevice cr should be managed by ndm or not.
 	NDMManagedKey = "ndm.io/managed"
+	// NDMZpoolName specifies the zpool name
+	NDMZpoolName = "ndm.io/zpool-name"
 )
 
 const (

cmd/ndm_daemonset/probe/usedbyprobe.go

@@ -129,10 +129,11 @@ func (sp *usedbyProbe) FillBlockDeviceDetails(blockDevice *blockdevice.BlockDevi
 
 		// check for ZFS file system
 		fstype := usedByProbe.BlkidIdentifier.GetOnDiskFileSystem()
-
+		zpool := usedByProbe.BlkidIdentifier.GetOnDiskLabel()
 		if fstype == zfsFileSystemLabel {
 			blockDevice.DevUse.InUse = true
-
+			blockDevice.FSInfo.FileSystem = zfsFileSystemLabel
+			blockDevice.Labels[controller.NDMZpoolName] = zpool
 			// the disk can either be in use by cstor or zfs local PV
 			ok, err := isBlockDeviceInUseByKernel(blockDevice.DevPath)
 

pkg/blkid/blkid.go

@@ -31,6 +31,7 @@ import (
 
 const (
 	fsTypeIdentifier = "TYPE"
+	labelIdentifier  = "LABEL"
 )
 
 type DeviceIdentifier struct {
@@ -40,17 +41,27 @@ type DeviceIdentifier struct {
 // GetOnDiskFileSystem returns the filesystem present on the disk by reading from the disk
 // using libblkid
 func (di *DeviceIdentifier) GetOnDiskFileSystem() string {
+	return di.GetTagValue(fsTypeIdentifier)
+}
+
+// GetOnDiskLabel returns the label present on the disk by reading from the disk
+// using libblkid
+func (di *DeviceIdentifier) GetOnDiskLabel() string {
+	return di.GetTagValue(labelIdentifier)
+}
+
+func (di *DeviceIdentifier) GetTagValue(tag string) string {
 	var blkidType *C.char
-	blkidType = C.CString(fsTypeIdentifier)
+	blkidType = C.CString(tag)
 	defer C.free(unsafe.Pointer(blkidType))
 
 	var device *C.char
 	device = C.CString(di.DevPath)
 	defer C.free(unsafe.Pointer(device))
 
-	var fstype *C.char
-	fstype = C.blkid_get_tag_value(nil, blkidType, device)
-	defer C.free(unsafe.Pointer(fstype))
+	var tagValue *C.char
+	tagValue = C.blkid_get_tag_value(nil, blkidType, device)
+	defer C.free(unsafe.Pointer(tagValue))
 
-	return C.GoString(fstype)
+	return C.GoString(tagValue)
 }