-
Notifications
You must be signed in to change notification settings - Fork 316
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
koord-manager: refactor gpu device resource plugin
Signed-off-by: saintube <saintube@foxmail.com>
- Loading branch information
Showing
6 changed files
with
302 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
pkg/slo-controller/noderesource/plugins/gpudeviceresource/device_event_handler.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| Copyright 2022 The Koordinator Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package gpudeviceresource | ||
|
|
||
| import ( | ||
| "reflect" | ||
|
|
||
| "k8s.io/apimachinery/pkg/types" | ||
| "k8s.io/client-go/util/workqueue" | ||
| "sigs.k8s.io/controller-runtime/pkg/event" | ||
| "sigs.k8s.io/controller-runtime/pkg/handler" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
|
|
||
| schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" | ||
| ) | ||
|
|
||
| var _ handler.EventHandler = &DeviceHandler{} | ||
|
|
||
| type DeviceHandler struct{} | ||
|
|
||
| func (d *DeviceHandler) Create(e event.CreateEvent, q workqueue.RateLimitingInterface) { | ||
| device := e.Object.(*schedulingv1alpha1.Device) | ||
| q.Add(reconcile.Request{ | ||
| NamespacedName: types.NamespacedName{ | ||
| Name: device.Name, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func (d *DeviceHandler) Update(e event.UpdateEvent, q workqueue.RateLimitingInterface) { | ||
| newDevice := e.ObjectNew.(*schedulingv1alpha1.Device) | ||
| oldDevice := e.ObjectOld.(*schedulingv1alpha1.Device) | ||
| if reflect.DeepEqual(newDevice.Spec, oldDevice.Spec) { | ||
| return | ||
| } | ||
| q.Add(reconcile.Request{ | ||
| NamespacedName: types.NamespacedName{ | ||
| Name: newDevice.Name, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func (d *DeviceHandler) Delete(e event.DeleteEvent, q workqueue.RateLimitingInterface) { | ||
| device, ok := e.Object.(*schedulingv1alpha1.Device) | ||
| if !ok { | ||
| return | ||
| } | ||
| q.Add(reconcile.Request{ | ||
| NamespacedName: types.NamespacedName{ | ||
| Name: device.Name, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func (d *DeviceHandler) Generic(e event.GenericEvent, q workqueue.RateLimitingInterface) { | ||
| } |
226 changes: 226 additions & 0 deletions
226
pkg/slo-controller/noderesource/plugins/gpudeviceresource/plugin.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,226 @@ | ||
| /* | ||
| Copyright 2022 The Koordinator Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package gpudeviceresource | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/errors" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "k8s.io/klog/v2" | ||
| ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/source" | ||
|
|
||
| "github.com/koordinator-sh/koordinator/apis/configuration" | ||
| "github.com/koordinator-sh/koordinator/apis/extension" | ||
| schedulingv1alpha1 "github.com/koordinator-sh/koordinator/apis/scheduling/v1alpha1" | ||
| "github.com/koordinator-sh/koordinator/pkg/slo-controller/noderesource/framework" | ||
| "github.com/koordinator-sh/koordinator/pkg/util" | ||
| ) | ||
|
|
||
| const PluginName = "GPUDeviceResource" | ||
|
|
||
| const ( | ||
| ResetResourcesMsg = "reset node gpu resources" | ||
| UpdateResourcesMsg = "node gpu resources from device" | ||
| UpdateLabelsMsg = "node gpu labels from device" | ||
| ) | ||
|
|
||
| var ( | ||
| ResourceNames = []corev1.ResourceName{ | ||
| extension.ResourceGPU, | ||
| extension.ResourceGPUCore, | ||
| extension.ResourceGPUMemory, | ||
| extension.ResourceGPUMemoryRatio, | ||
| } | ||
|
|
||
| client ctrlclient.Client | ||
| ) | ||
|
|
||
| type Plugin struct{} | ||
|
|
||
| func (p *Plugin) Name() string { | ||
| return PluginName | ||
| } | ||
|
|
||
| // +kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch | ||
| // +kubebuilder:rbac:groups=core,resources=nodes,verbs=get;list;watch;patch | ||
| // +kubebuilder:rbac:groups=core,resources=nodes/status,verbs=get;update;patch | ||
| // +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch | ||
| // +kubebuilder:rbac:groups=scheduling.koordinator.sh,resources=devices,verbs=get;list;watch | ||
| // +kubebuilder:rbac:groups=topology.node.k8s.io,resources=noderesourcetopologies,verbs=get;list;watch;create;update | ||
|
|
||
| func (p *Plugin) Setup(opt *framework.Option) error { | ||
| client = opt.Client | ||
|
|
||
| // schedulingv1alpha1.AddToScheme(opt.Scheme) | ||
| opt.Builder = opt.Builder.Watches(&source.Kind{Type: &schedulingv1alpha1.Device{}}, &DeviceHandler{}) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (p *Plugin) NeedSync(strategy *configuration.ColocationStrategy, oldNode, newNode *corev1.Node) (bool, string) { | ||
| for _, resourceName := range ResourceNames { | ||
| if util.IsResourceDiff(oldNode.Status.Allocatable, newNode.Status.Allocatable, resourceName, | ||
| *strategy.ResourceDiffThreshold) { | ||
| klog.V(4).Infof("node %s resource %s diff bigger than %v, need sync", | ||
| newNode.Name, resourceName, *strategy.ResourceDiffThreshold) | ||
| return true, "gpu resource diff is big than threshold" | ||
| } | ||
| } | ||
|
|
||
| return false, "" | ||
| } | ||
|
|
||
| func (p *Plugin) NeedSyncMeta(_ *configuration.ColocationStrategy, oldNode, newNode *corev1.Node) (bool, string) { | ||
| if oldNode.Labels[extension.LabelGPUModel] != newNode.Labels[extension.LabelGPUModel] { | ||
| klog.V(4).InfoS("need sync node metadata since gpu model change", "node", newNode.Name, | ||
| "old", oldNode.Labels[extension.LabelGPUModel], "new", newNode.Labels[extension.LabelGPUModel]) | ||
| return true, "gpu model changed" | ||
| } | ||
| if oldNode.Labels[extension.LabelGPUDriverVersion] != newNode.Labels[extension.LabelGPUDriverVersion] { | ||
| klog.V(4).InfoS("need sync node metadata since gpu driver version change", "node", newNode.Name, | ||
| "old", oldNode.Labels[extension.LabelGPUDriverVersion], "new", newNode.Labels[extension.LabelGPUDriverVersion]) | ||
| return true, "gpu driver version changed" | ||
| } | ||
|
|
||
| return false, "" | ||
| } | ||
|
|
||
| func (p *Plugin) Prepare(_ *configuration.ColocationStrategy, node *corev1.Node, nr *framework.NodeResource) error { | ||
| // prepare node resources | ||
| for _, resourceName := range ResourceNames { | ||
| q := nr.Resources[resourceName] | ||
| // FIXME: shall we remove the resource when some of resources is missing | ||
| if q == nil || nr.Resets[resourceName] { | ||
| delete(node.Status.Allocatable, resourceName) | ||
| delete(node.Status.Capacity, resourceName) | ||
| continue | ||
| } | ||
|
|
||
| node.Status.Allocatable[resourceName] = *q | ||
| node.Status.Capacity[resourceName] = *q | ||
| } | ||
|
|
||
| // prepare node labels | ||
| // FIXME: do we need reset labels | ||
| if nr.Labels == nil { | ||
| delete(node.Labels, extension.LabelGPUModel) | ||
| delete(node.Labels, extension.LabelGPUDriverVersion) | ||
| } else { | ||
| if _, ok := nr.Labels[extension.LabelGPUModel]; ok { | ||
| node.Labels[extension.LabelGPUModel] = nr.Labels[extension.LabelGPUModel] | ||
| } else { | ||
| delete(node.Labels, extension.LabelGPUModel) | ||
| } | ||
| if _, ok := nr.Labels[extension.LabelGPUDriverVersion]; ok { | ||
| node.Labels[extension.LabelGPUDriverVersion] = nr.Labels[extension.LabelGPUDriverVersion] | ||
| } else { | ||
| delete(node.Labels, extension.LabelGPUDriverVersion) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (p *Plugin) Reset(node *corev1.Node, message string) []framework.ResourceItem { | ||
| // FIXME: shall we reset koord-gpu resources when the colocation disabled? | ||
| return nil | ||
| } | ||
|
|
||
| func (p *Plugin) Calculate(_ *configuration.ColocationStrategy, node *corev1.Node, _ *corev1.PodList, _ *framework.ResourceMetrics) ([]framework.ResourceItem, error) { | ||
| if node == nil || node.Status.Allocatable == nil { | ||
| return nil, fmt.Errorf("missing essential arguments") | ||
| } | ||
|
|
||
| // calculate device resources | ||
| device := &schedulingv1alpha1.Device{} | ||
| if err := client.Get(context.TODO(), types.NamespacedName{Name: node.Name, Namespace: node.Namespace}, device); err != nil { | ||
| if !errors.IsNotFound(err) { | ||
| klog.V(4).InfoS("failed to get device for node", "node", node.Name, "err", err) | ||
| return nil, fmt.Errorf("failed to get device resources: %w", err) | ||
| } | ||
|
|
||
| // device not found, reset gpu resources on node | ||
| return p.resetGPUNodeResource() | ||
| } | ||
|
|
||
| // TODO: also handle NUMA-level resources NRT | ||
| return p.calculate(node, device) | ||
| } | ||
|
|
||
| func (p *Plugin) calculate(node *corev1.Node, device *schedulingv1alpha1.Device) ([]framework.ResourceItem, error) { | ||
| if device == nil { | ||
| return nil, fmt.Errorf("invalid device") | ||
| } | ||
|
|
||
| // calculate gpu resources | ||
| gpuResources := make(corev1.ResourceList) | ||
| totalKoordGPU := resource.NewQuantity(0, resource.DecimalSI) | ||
| for _, d := range device.Spec.Devices { | ||
| if d.Type != schedulingv1alpha1.GPU || !d.Health { | ||
| continue | ||
| } | ||
| util.AddResourceList(gpuResources, d.Resources) | ||
| totalKoordGPU.Add(d.Resources[extension.ResourceGPUCore]) | ||
| } | ||
| gpuResources[extension.ResourceGPU] = *totalKoordGPU | ||
| // FIXME: shall we update the node gpu resources when the sum of koord-gpu resources is zero? | ||
| var items []framework.ResourceItem | ||
| for _, resourceName := range ResourceNames { | ||
| q, ok := gpuResources[resourceName] | ||
| if !ok { | ||
| continue | ||
| } | ||
| items = append(items, framework.ResourceItem{ | ||
| Name: resourceName, | ||
| Quantity: &q, | ||
| Message: UpdateResourcesMsg, | ||
| }) | ||
| } | ||
| klog.V(5).InfoS("calculate gpu resources", "node", node.Name, "resources", gpuResources) | ||
|
|
||
| // calculate labels about gpu driver and model | ||
| if device.Labels != nil { | ||
| items = append(items, framework.ResourceItem{ | ||
| Name: PluginName, | ||
| Labels: map[string]string{ | ||
| extension.LabelGPUModel: device.Labels[extension.LabelGPUModel], | ||
| extension.LabelGPUDriverVersion: device.Labels[extension.LabelGPUDriverVersion], | ||
| }, | ||
| Message: UpdateLabelsMsg, | ||
| }) | ||
| } | ||
| klog.V(5).InfoS("calculate gpu labels", "node", node.Name, "labels", device.Labels) | ||
|
|
||
| return items, nil | ||
| } | ||
|
|
||
| func (p *Plugin) resetGPUNodeResource() ([]framework.ResourceItem, error) { | ||
| items := make([]framework.ResourceItem, 0, len(ResourceNames)) | ||
| for i := range ResourceNames { | ||
| items[i] = framework.ResourceItem{ | ||
| Name: ResourceNames[i], | ||
| Reset: true, | ||
| Message: ResetResourcesMsg, | ||
| } | ||
| } | ||
| return items, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters