Skip to content

Ray Serve readiness checks only proxy #4480

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

Open
spencer-p wants to merge 3 commits into
base: master
Choose a base branch
from
+20 −19
Open

Ray Serve readiness checks only proxy #4480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96d27be
Ray Serve readiness checks only proxy
spencer-p Feb 4, 2026
88b668f
Update ray-operator/controllers/ray/common/pod_test.go
spencer-p Feb 5, 2026
9af5145
Drop all readiness exec probes for Ray Serve
spencer-p Feb 7, 2026
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
20 changes: 10 additions & 10 deletions ray-operator/controllers/ray/common/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,20 +504,20 @@ func initLivenessAndReadinessProbe(rayContainer *corev1.Container, rayNodeType r
rayContainer.ReadinessProbe.Exec = &corev1.ExecAction{Command: []string{"bash", "-c", strings.Join(commands, " && ")}}
}

// For worker Pods serving traffic, we need to add an additional HTTP proxy health check for the readiness probe.
// For worker Pods serving traffic, the readiness probe checks the proxy
// instead of the raylet.
// Note: head Pod checks the HTTP proxy's health at every rayservice controller reconcile instaed of using readiness probe.
// See https://github.com/ray-project/kuberay/pull/1808 for reasons.
if creatorCRDType == utils.RayServiceCRD && rayNodeType == rayv1.WorkerNode {
rayContainer.ReadinessProbe.FailureThreshold = utils.ServeReadinessProbeFailureThreshold
rayServeProxyHealthCommand := fmt.Sprintf(
utils.BaseWgetHealthCommand,
utils.DefaultReadinessProbeInitialDelaySeconds,
utils.FindContainerPort(rayContainer, utils.ServingPortName, utils.DefaultServingPort),
utils.RayServeProxyHealthPath,
)
commands = append(commands, rayServeProxyHealthCommand)
rayContainer.ReadinessProbe.HTTPGet = nil
rayContainer.ReadinessProbe.Exec = &corev1.ExecAction{Command: []string{"bash", "-c", strings.Join(commands, " && ")}}
rayContainer.ReadinessProbe.Exec = nil
rayContainer.ReadinessProbe.HTTPGet = &corev1.HTTPGetAction{
Path: utils.RayServeProxyHealthPath,
Port: intstr.IntOrString{
Type: intstr.Int,
IntVal: utils.FindContainerPort(rayContainer, utils.ServingPortName, utils.DefaultServingPort),
},
}
}
}
}
Expand Down
19 changes: 10 additions & 9 deletions ray-operator/controllers/ray/common/pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1702,9 +1702,9 @@ func TestInitLivenessAndReadinessProbe(t *testing.T) {
rayContainer.ReadinessProbe = nil
initLivenessAndReadinessProbe(rayContainer, rayv1.WorkerNode, utils.RayServiceCRD, rayStartParams, "")
assert.NotNil(t, rayContainer.LivenessProbe.Exec)
assert.NotNil(t, rayContainer.ReadinessProbe.Exec)
assert.NotNil(t, rayContainer.ReadinessProbe.HTTPGet)
assert.NotContains(t, strings.Join(rayContainer.LivenessProbe.Exec.Command, " "), utils.RayServeProxyHealthPath)
assert.Contains(t, strings.Join(rayContainer.ReadinessProbe.Exec.Command, " "), utils.RayServeProxyHealthPath)
assert.Equal(t, int32(utils.DefaultServingPort), rayContainer.ReadinessProbe.HTTPGet.Port.IntVal)
assert.Equal(t, int32(2), rayContainer.LivenessProbe.TimeoutSeconds)
assert.Equal(t, int32(2), rayContainer.ReadinessProbe.TimeoutSeconds)

Expand Down Expand Up @@ -1772,9 +1772,9 @@ func TestInitLivenessAndReadinessProbe(t *testing.T) {
"dashboard-agent-listen-port": "8500",
}
initLivenessAndReadinessProbe(rayContainer, rayv1.WorkerNode, utils.RayServiceCRD, rayServiceWorkerParams, "")
rayServiceReadinessCommand := strings.Join(rayContainer.ReadinessProbe.Exec.Command, " ")
assert.Contains(t, rayServiceReadinessCommand, ":8500", "RayService worker should use custom dashboard-agent-listen-port")
assert.Contains(t, rayServiceReadinessCommand, utils.RayServeProxyHealthPath, "RayService worker should include serve proxy health check")
rayServiceLivenessCommand := strings.Join(rayContainer.LivenessProbe.Exec.Command, " ")
assert.Contains(t, rayServiceLivenessCommand, ":8500", "RayService worker should use custom dashboard-agent-listen-port")
assert.Equal(t, int32(utils.DefaultServingPort), rayContainer.ReadinessProbe.HTTPGet.Port.IntVal)
assert.Equal(t, int32(utils.ServeReadinessProbeFailureThreshold), rayContainer.ReadinessProbe.FailureThreshold, "RayService worker should have correct failure threshold")

// Test 8: Test invalid port values (should fall back to defaults)
Expand Down Expand Up @@ -1813,15 +1813,16 @@ func TestInitLivenessAndReadinessProbe(t *testing.T) {
assert.NotNil(t, rayContainer.LivenessProbe.HTTPGet)
assert.NotNil(t, rayContainer.ReadinessProbe.HTTPGet)

// Ray Serve workers still use exec probes for readiness to check the proxy actor.
// Ray Serve workers check the proxy actor for readiness.
rayContainer.LivenessProbe = nil
rayContainer.ReadinessProbe = nil
initLivenessAndReadinessProbe(rayContainer, rayv1.WorkerNode, utils.RayServiceCRD, rayStartParams, "2.53.0")
assert.NotNil(t, rayContainer.LivenessProbe.HTTPGet)
assert.Nil(t, rayContainer.LivenessProbe.Exec)
assert.Nil(t, rayContainer.ReadinessProbe.HTTPGet)
assert.NotNil(t, rayContainer.ReadinessProbe.Exec)
assert.Contains(t, strings.Join(rayContainer.ReadinessProbe.Exec.Command, " "), utils.RayServeProxyHealthPath)
assert.Nil(t, rayContainer.ReadinessProbe.Exec)
assert.NotNil(t, rayContainer.ReadinessProbe.HTTPGet)
assert.Equal(t, int32(utils.DefaultServingPort), rayContainer.ReadinessProbe.HTTPGet.Port.IntVal)
assert.Equal(t, utils.RayServeProxyHealthPath, rayContainer.ReadinessProbe.HTTPGet.Path)

// Versions parsed below 2.53 must use exec probes.
rayContainer.LivenessProbe = nil
Expand Down
Loading