crd: introduce disk driver in node.spec.diskSpec

Longhorn 7672

Signed-off-by: Derek Su <[email protected]>

Author: derekbit

controller/controller_test.go

@@ -519,6 +519,7 @@ func newNode(name, namespace string, allowScheduling bool, status longhorn.Condi
 				TestDiskID1: {
 					Type:            longhorn.DiskTypeFilesystem,
 					Path:            TestDefaultDataPath,
+					DiskDriver:          longhorn.DiskDriverNone,
 					AllowScheduling: true,
 					StorageReserved: 0,
 				},

controller/independent_test.go

@@ -24,16 +24,19 @@ func (s *TestSuite) TestBackingImageCleanup(c *C) {
 				TestDiskID1: {
 					Type:            longhorn.DiskTypeFilesystem,
 					Path:            TestDefaultDataPath + "1",
+					DiskDriver:      longhorn.DiskDriverNone,
 					AllowScheduling: true,
 				},
 				TestDiskID2: {
 					Type:            longhorn.DiskTypeFilesystem,
 					Path:            TestDefaultDataPath + "2",
+					DiskDriver:      longhorn.DiskDriverNone,
 					AllowScheduling: true,
 				},
 				TestDiskID3: {
 					Type:            longhorn.DiskTypeFilesystem,
 					Path:            TestDefaultDataPath + "3",
+					DiskDriver:      longhorn.DiskDriverNone,
 					AllowScheduling: true,
 				},
 			},

controller/node_controller_test.go

@@ -747,6 +747,7 @@ func (s *NodeControllerSuite) TestDisableDiskOnFilesystemChange(c *C) {
 		TestDiskID1: {
 			Type:            longhorn.DiskTypeFilesystem,
 			Path:            TestDefaultDataPath,
+			DiskDriver:      longhorn.DiskDriverNone,
 			AllowScheduling: true,
 			StorageReserved: 0,
 		},

k8s/crds.yaml

@@ -2123,6 +2123,12 @@ spec:
                   properties:
                     allowScheduling:
                       type: boolean
+                    diskDriver:
+                      enum:
+                      - ""
+                      - auto
+                      - aio
+                      type: string
                     diskType:
                       enum:
                       - filesystem
@@ -2208,6 +2214,12 @@ spec:
                         type: object
                       nullable: true
                       type: array
+                    diskDriver:
+                      type: string
+                    diskName:
+                      type: string
+                    diskPath:
+                      type: string
                     diskType:
                       type: string
                     diskUUID:

k8s/pkg/apis/longhorn/v1beta2/node.go

@@ -55,6 +55,14 @@ const (
 	DiskTypeBlock = DiskType("block")
 )
 
+type DiskDriver string
+
+const (
+	DiskDriverNone = DiskDriver("")
+	DiskDriverAuto = DiskDriver("auto")
+	DiskDriverAio  = DiskDriver("aio")
+)
+
 type SnapshotCheckStatus struct {
 	// +optional
 	LastPeriodicCheckedAt metav1.Time `json:"lastPeriodicCheckedAt"`
@@ -66,6 +74,9 @@ type DiskSpec struct {
 	Type DiskType `json:"diskType"`
 	// +optional
 	Path string `json:"path"`
+	// +kubebuilder:validation:Enum="";auto;aio
+	// +optional
+	DiskDriver DiskDriver `json:"diskDriver"`
 	// +optional
 	AllowScheduling bool `json:"allowScheduling"`
 	// +optional
@@ -92,8 +103,14 @@ type DiskStatus struct {
 	// +optional
 	DiskUUID string `json:"diskUUID"`
 	// +optional
+	DiskName string `json:"diskName"`
+	// +optional
+	DiskPath string `json:"diskPath"`
+	// +optional
 	Type DiskType `json:"diskType"`
 	// +optional
+	DiskDriver DiskDriver `json:"diskDriver"`
+	// +optional
 	FSType string `json:"filesystemType"`
 }
 

scheduler/replica_scheduler_test.go

@@ -159,6 +159,7 @@ func newDisk(path string, allowScheduling bool, storageReserved int64) longhorn.
 	return longhorn.DiskSpec{
 		Type:            longhorn.DiskTypeFilesystem,
 		Path:            path,
+		DiskDriver:      longhorn.DiskDriverNone,
 		AllowScheduling: allowScheduling,
 		StorageReserved: storageReserved,
 	}

types/types.go

@@ -999,6 +999,7 @@ func CreateDefaultDisk(dataPath string, storageReservedPercentage int64) (map[st
 			DefaultDiskPrefix + util.RandomID(): {
 				Type:              longhorn.DiskTypeBlock,
 				Path:              dataPath,
+				DiskDriver:        longhorn.DiskDriverAuto,
 				AllowScheduling:   true,
 				EvictionRequested: false,
 				StorageReserved:   0,
@@ -1021,6 +1022,7 @@ func CreateDefaultDisk(dataPath string, storageReservedPercentage int64) (map[st
 		DefaultDiskPrefix + diskStat.DiskID: {
 			Type:              longhorn.DiskTypeFilesystem,
 			Path:              diskStat.Path,
+			DiskDriver:        longhorn.DiskDriverNone,
 			AllowScheduling:   true,
 			EvictionRequested: false,
 			StorageReserved:   diskStat.StorageMaximum * storageReservedPercentage / 100,