Skip to content
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

[RayService] Trim Redis Cleanup job less than 63 chars #2846

Merged
merged 6 commits into from
Jan 31, 2025
Merged

[RayService] Trim Redis Cleanup job less than 63 chars #2846

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
29e595b
redis cleanup
aviadshimoni Jan 28, 2025
0c1e368
small comments change
aviadshimoni Jan 28, 2025
c219805
1. trim labels value like here: https://github.com/ray-project/kuber…
aviadshimoni Jan 30, 2025
d965072
Update ray-operator/controllers/ray/raycluster_controller.go
aviadshimoni Jan 31, 2025
5177fe3
Update ray-operator/controllers/ray/raycluster_controller.go
aviadshimoni Jan 31, 2025
909ad73
remove empty line
aviadshimoni Jan 31, 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
19 changes: 14 additions & 5 deletions ray-operator/controllers/ray/raycluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,14 +1143,20 @@ func (r *RayClusterReconciler) buildWorkerPod(ctx context.Context, instance rayv
func (r *RayClusterReconciler) buildRedisCleanupJob(ctx context.Context, instance rayv1.RayCluster) batchv1.Job {
logger := ctrl.LoggerFrom(ctx)

// Build the head pod
pod := r.buildHeadPod(ctx, instance)
pod.Labels[utils.RayNodeTypeLabelKey] = string(rayv1.RedisCleanupNode)

// Trim all labels to ensure they are within the 63-character limit
for key, value := range pod.Labels {
pod.Labels[key] = utils.CheckLabel(value)
}

// Only keep the Ray container in the Redis cleanup Job.
pod.Spec.Containers = []corev1.Container{pod.Spec.Containers[utils.RayContainerIndex]}
pod.Spec.Containers[utils.RayContainerIndex].Command = []string{"/bin/bash", "-lc", "--"}
pod.Spec.Containers[utils.RayContainerIndex].Args = []string{
"echo \"To get more information about manually delete the storage namespace in Redis and remove the RayCluster's finalizer, please check https://docs.ray.io/en/master/cluster/kubernetes/user-guides/kuberay-gcs-ft.html for more details.\" && " +
"echo \"To get more information about manually deleting the storage namespace in Redis and removing the RayCluster's finalizer, please check https://docs.ray.io/en/master/cluster/kubernetes/user-guides/kuberay-gcs-ft.html for more details.\" && " +
"python -c " +
"\"from ray._private.gcs_utils import cleanup_redis_storage; " +
"from urllib.parse import urlparse; " +
Expand Down Expand Up @@ -1180,8 +1186,8 @@ func (r *RayClusterReconciler) buildRedisCleanupJob(ctx context.Context, instanc
Value: "500",
})

// The container's resource consumption remains constant. so hard-coding the resources is acceptable.
// In addition, avoid using the GPU for the Redis cleanup Job.
// The container's resource consumption remains constant. Hard-coding the resources is acceptable.
// Avoid using the GPU for the Redis cleanup Job.
pod.Spec.Containers[utils.RayContainerIndex].Resources = corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("200m"),
Expand All @@ -1196,9 +1202,12 @@ func (r *RayClusterReconciler) buildRedisCleanupJob(ctx context.Context, instanc
// For Kubernetes Job, the valid values for Pod's `RestartPolicy` are `Never` and `OnFailure`.
pod.Spec.RestartPolicy = corev1.RestartPolicyNever

// Trim the job name to ensure it is within the 63-character limit.
jobName := utils.CheckLabel(fmt.Sprintf("%s-%s", instance.Name, "redis-cleanup"))

redisCleanupJob := batchv1.Job{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-%s", instance.Name, "redis-cleanup"),
Name: jobName,
Namespace: instance.Namespace,
Labels: pod.Labels,
Annotations: pod.Annotations,
Expand All @@ -1209,7 +1218,7 @@ func (r *RayClusterReconciler) buildRedisCleanupJob(ctx context.Context, instanc
ObjectMeta: pod.ObjectMeta,
Spec: pod.Spec,
},
// make this job be best-effort only for 5 minutes.
// Make this job best-effort only for 5 minutes.
ActiveDeadlineSeconds: ptr.To[int64](300),
},
}
Expand Down
Loading