Complete feature impl, fix issues, add perDeviceNodeSelection support, add tests, address comments, etc.

Author: cici37

pkg/scheduler/framework/plugins/dynamicresources/dynamicresources.go

@@ -102,10 +102,11 @@ type informationForClaim struct {
 
 // DynamicResources is a plugin that ensures that ResourceClaims are allocated.
 type DynamicResources struct {
-	enabled                   bool
-	enableAdminAccess         bool
-	enablePrioritizedList     bool
-	enableSchedulingQueueHint bool
+	enabled                    bool
+	enableAdminAccess          bool
+	enablePrioritizedList      bool
+	enableSchedulingQueueHint  bool
+	enablePartitionableDevices bool
 	enableDeviceTaints        bool
 
 	fh         framework.Handle
@@ -122,11 +123,12 @@ func New(ctx context.Context, plArgs runtime.Object, fh framework.Handle, fts fe
 	}
 
 	pl := &DynamicResources{
-		enabled:                   true,
-		enableAdminAccess:         fts.EnableDRAAdminAccess,
-		enableDeviceTaints:        fts.EnableDRADeviceTaints,
-		enablePrioritizedList:     fts.EnableDRAPrioritizedList,
-		enableSchedulingQueueHint: fts.EnableSchedulingQueueHint,
+		enabled:                    true,
+		enableAdminAccess:          fts.EnableDRAAdminAccess,
+		enableDeviceTaints:         fts.EnableDRADeviceTaints,
+		enablePrioritizedList:      fts.EnableDRAPrioritizedList,
+		enableSchedulingQueueHint:  fts.EnableSchedulingQueueHint,
+		enablePartitionableDevices: fts.EnablePartitionableDevices,
 
 		fh:        fh,
 		clientset: fh.ClientSet(),
@@ -455,8 +457,9 @@ func (pl *DynamicResources) PreFilter(ctx context.Context, state *framework.Cycl
 			return nil, statusError(logger, err)
 		}
 		features := structured.Features{
-			AdminAccess:     pl.enableAdminAccess,
-			PrioritizedList: pl.enablePrioritizedList,
+			AdminAccess:          pl.enableAdminAccess,
+			PrioritizedList:      pl.enablePrioritizedList,
+			PartitionableDevices: pl.enablePartitionableDevices,
 			DeviceTaints:    pl.enableDeviceTaints,
 		}
 		allocator, err := structured.NewAllocator(ctx, features, allocateClaims, allAllocatedDevices, pl.draManager.DeviceClasses(), slices, pl.celCache)

pkg/scheduler/framework/plugins/feature/feature.go

@@ -33,5 +33,6 @@ type Features struct {
 	EnableSchedulingQueueHint                    bool
 	EnableAsyncPreemption                        bool
 	EnablePodLevelResources                      bool
+	EnablePartitionableDevices                   bool
 	EnableStorageCapacityScoring                 bool
 }

pkg/scheduler/framework/plugins/registry.go

@@ -59,6 +59,7 @@ func NewInTreeRegistry() runtime.Registry {
 		EnableSchedulingQueueHint:                    feature.DefaultFeatureGate.Enabled(features.SchedulerQueueingHints),
 		EnableAsyncPreemption:                        feature.DefaultFeatureGate.Enabled(features.SchedulerAsyncPreemption),
 		EnablePodLevelResources:                      feature.DefaultFeatureGate.Enabled(features.PodLevelResources),
+		EnablePartitionableDevices:                   feature.DefaultFeatureGate.Enabled(features.DRAPartitionableDevices),
 		EnableStorageCapacityScoring:                 feature.DefaultFeatureGate.Enabled(features.StorageCapacityScoring),
 	}
 

staging/src/k8s.io/dynamic-resource-allocation/resourceslice/resourceslicecontroller.go

@@ -141,7 +141,9 @@ type Pool struct {
 // Slice is turned into one ResourceSlice by the controller.
 type Slice struct {
 	// Devices lists all devices which are part of the slice.
-	Devices []resourceapi.Device
+	Devices                []resourceapi.Device
+	SharedCounters         []resourceapi.CounterSet
+	PerDeviceNodeSelection *bool
 }
 
 // +k8s:deepcopy-gen=true
@@ -548,7 +550,9 @@ func (c *Controller) syncPool(ctx context.Context, poolName string) error {
 			if !apiequality.Semantic.DeepEqual(&currentSlice.Spec.Pool, &desiredPool) ||
 				!apiequality.Semantic.DeepEqual(currentSlice.Spec.NodeSelector, pool.NodeSelector) ||
 				currentSlice.Spec.AllNodes != desiredAllNodes ||
-				!DevicesDeepEqual(currentSlice.Spec.Devices, pool.Slices[i].Devices) {
+				!DevicesDeepEqual(currentSlice.Spec.Devices, pool.Slices[i].Devices) ||
+				!apiequality.Semantic.DeepEqual(currentSlice.Spec.SharedCounters, pool.Slices[i].SharedCounters) ||
+				!apiequality.Semantic.DeepEqual(currentSlice.Spec.PerDeviceNodeSelection, pool.Slices[i].PerDeviceNodeSelection) {
 				changedDesiredSlices.Insert(i)
 				logger.V(5).Info("Need to update slice", "slice", klog.KObj(currentSlice), "matchIndex", i)
 			}
@@ -588,6 +592,8 @@ func (c *Controller) syncPool(ctx context.Context, poolName string) error {
 			// have listed the existing slice.
 			slice.Spec.NodeSelector = pool.NodeSelector
 			slice.Spec.AllNodes = desiredAllNodes
+			slice.Spec.SharedCounters = pool.Slices[i].SharedCounters
+			slice.Spec.PerDeviceNodeSelection = pool.Slices[i].PerDeviceNodeSelection
 			// Preserve TimeAdded from existing device, if there is a matching device and taint.
 			slice.Spec.Devices = copyTaintTimeAdded(slice.Spec.Devices, pool.Slices[i].Devices)
 
@@ -639,12 +645,14 @@ func (c *Controller) syncPool(ctx context.Context, poolName string) error {
 					GenerateName:    generateName,
 				},
 				Spec: resourceapi.ResourceSliceSpec{
-					Driver:       c.driverName,
-					Pool:         desiredPool,
-					NodeName:     nodeName,
-					NodeSelector: pool.NodeSelector,
-					AllNodes:     desiredAllNodes,
-					Devices:      pool.Slices[i].Devices,
+					Driver:                 c.driverName,
+					Pool:                   desiredPool,
+					NodeName:               nodeName,
+					NodeSelector:           pool.NodeSelector,
+					AllNodes:               desiredAllNodes,
+					Devices:                pool.Slices[i].Devices,
+					SharedCounters:         pool.Slices[i].SharedCounters,
+					PerDeviceNodeSelection: pool.Slices[i].PerDeviceNodeSelection,
 				},
 			}