Skip to content

[draft pr][RayJob] Use timeout to prevent RayCluster leak #4090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[draft pr][RayJob] Use timeout to prevent RayCluster leak #4090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6680c1
[draft pr][RayJob] Use timeout to prevent RayCluster leak
Future-Outlier Sep 22, 2025
8a4cd06
update
Future-Outlier Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ray-operator/apis/ray/v1/rayjob_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ const (
AppFailed JobFailedReason = "AppFailed"
JobDeploymentStatusTransitionGracePeriodExceeded JobFailedReason = "JobDeploymentStatusTransitionGracePeriodExceeded"
ValidationFailed JobFailedReason = "ValidationFailed"
JobRunningTimeoutExceeded JobFailedReason = "JobRunningTimeoutExceeded"
)

type JobSubmissionMode string
Expand Down
43 changes: 43 additions & 0 deletions ray-operator/controllers/ray/rayjob_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,10 @@ func (r *RayJobReconciler) Reconcile(ctx context.Context, request ctrl.Request)
}
}

// if shouldUpdate := checkSubmitterFinishedTimeoutAndUpdateStatusIfNeeded(ctx, rayJobInstance); shouldUpdate {
// break
// }

// Check the current status of ray jobs
rayDashboardClient, err := r.dashboardClientFunc(rayClusterInstance, rayJobInstance.Status.DashboardURL)
if err != nil {
Expand Down Expand Up @@ -463,6 +467,45 @@ func (r *RayJobReconciler) Reconcile(ctx context.Context, request ctrl.Request)
return ctrl.Result{RequeueAfter: RayJobDefaultRequeueDuration}, nil
}

// func updateStatusIfNeededAfterSubmitterFinished(ctx context.Context, rayJob *rayv1.RayJob, jobInfo *rayv1.RayJobStatusInfo) bool {
// logger := ctrl.LoggerFrom(ctx)

// if jobInfo.JobStatus != rayv1.JobStatusRunning {
// return false
// }

// timeoutSeconds := int32(30)
// if rayJob.Spec.JobRunningTimeoutSeconds != nil {
// timeoutSeconds = *rayJob.Spec.JobRunningTimeoutSeconds
// }

// var jobStartTime time.Time
// if jobInfo.StartTime != 0 {
// jobStartTime = time.UnixMilli(utils.SafeUint64ToInt64(jobInfo.StartTime))
// } else if rayJob.Status.RayJobStatusInfo.StartTime != nil {
// jobStartTime = rayJob.Status.RayJobStatusInfo.StartTime.Time
// } else {
// jobStartTime = rayJob.Status.StartTime.Time
// }

// timeoutTime := jobStartTime.Add(time.Duration(timeoutSeconds) * time.Second)

// if time.Now().After(timeoutTime) {
// logger.Info("JobRunningTimeout exceeded. Forcing JobDeploymentStatus to Failed.",
// "JobStartTime", jobStartTime,
// "TimeoutSeconds", timeoutSeconds,
// "JobStatus", jobInfo.JobStatus)

// rayJob.Status.JobDeploymentStatus = rayv1.JobDeploymentStatusFailed
// rayJob.Status.Reason = rayv1.JobRunningTimeoutExceeded
// rayJob.Status.Message = fmt.Sprintf("JobRunningTimeout exceeded. JobStartTime: %v, TimeoutSeconds: %d, JobStatus: %s",
// jobStartTime, timeoutSeconds, jobInfo.JobStatus)
// return true
// }

// return false
// }

func validateRayJob(ctx context.Context, rayJobInstance *rayv1.RayJob) (utils.K8sEventType, error) {
logger := ctrl.LoggerFrom(ctx)
validationRules := []struct {
Expand Down
Loading