Files
Fangyin ChengandGitHub 18927477e7 [Fix][operator] Fix volcano podgroup stuck in inqueue state after rayjob completes (#4476)
* fix: Fix volcano podgroup stuck in inqueue state after rayjob completes

* fix: fix rayjob controller error handle

* chore: remove unused permissions

* chore: add k8s event when delete podgroup

* chore: new k8s event when cleanup batch scheduler

* fix: fix unit test

* chore: reduce the number of API calls
2026-03-10 08:19:10 -07:00

81 lines
3.2 KiB
Go

package schedulerinterface
import (
"context"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
)
// BatchScheduler manages submitting RayCluster pods to a third-party scheduler.
type BatchScheduler interface {
// Name corresponds to the schedulerName in Kubernetes:
// https://kubernetes.io/docs/tasks/extend-kubernetes/configure-multiple-schedulers/
Name() string
// DoBatchSchedulingOnSubmission handles submitting the RayCluster/RayJob to the batch scheduler on creation / update
// For most batch schedulers, this results in the creation of a PodGroup.
DoBatchSchedulingOnSubmission(ctx context.Context, object metav1.Object) error
// AddMetadataToChildResource enriches the child resource (batchv1.Job, rayv1.RayCluster) with metadata necessary to tie it to the scheduler.
// For example, setting labels for queues / priority, and setting schedulerName.
AddMetadataToChildResource(ctx context.Context, parent metav1.Object, child metav1.Object, groupName string)
// CleanupOnCompletion handles cleanup when the RayJob reaches terminal state (Complete/Failed).
// For batch schedulers like Volcano, this deletes the PodGroup to release queue resources.
// This is a no-op for schedulers that don't need cleanup.
// Returns (didCleanup, error) where didCleanup indicates whether actual cleanup was performed.
CleanupOnCompletion(ctx context.Context, object metav1.Object) (didCleanup bool, err error)
}
// BatchSchedulerFactory handles initial setup of the scheduler plugin by registering the
// necessary callbacks with the operator, and the creation of the BatchScheduler itself.
type BatchSchedulerFactory interface {
// New creates a new BatchScheduler for the scheduler plugin.
New(ctx context.Context, config *rest.Config, cli client.Client) (BatchScheduler, error)
// AddToScheme adds the types in this scheduler to the given scheme (runs during init).
AddToScheme(scheme *runtime.Scheme)
// ConfigureReconciler configures the RayCluster Reconciler in the process of being built by
// adding watches for its scheduler-specific custom resource types, and any other needed setup.
ConfigureReconciler(b *builder.Builder) *builder.Builder
}
type DefaultBatchScheduler struct{}
type DefaultBatchSchedulerFactory struct{}
func GetDefaultPluginName() string {
return "default"
}
func (d *DefaultBatchScheduler) Name() string {
return GetDefaultPluginName()
}
func (d *DefaultBatchScheduler) DoBatchSchedulingOnSubmission(_ context.Context, _ metav1.Object) error {
return nil
}
func (d *DefaultBatchScheduler) AddMetadataToChildResource(_ context.Context, _ metav1.Object, _ metav1.Object, _ string) {
}
func (d *DefaultBatchScheduler) CleanupOnCompletion(_ context.Context, _ metav1.Object) (bool, error) {
return false, nil
}
func (df *DefaultBatchSchedulerFactory) New(_ context.Context, _ *rest.Config, _ client.Client) (BatchScheduler, error) {
return &DefaultBatchScheduler{}, nil
}
func (df *DefaultBatchSchedulerFactory) AddToScheme(_ *runtime.Scheme) {
}
func (df *DefaultBatchSchedulerFactory) ConfigureReconciler(b *builder.Builder) *builder.Builder {
return b
}