Skip to content

Commit 2273812

Browse files
authored
[Cherry-pick] Fix Log to indicate we are Using DashboardPort in RayService (#2001) (#2018)
1 parent c3775bf commit 2273812

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

ray-operator/controllers/ray/rayservice_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,15 +836,15 @@ func (r *RayServiceReconciler) updateServeDeployment(ctx context.Context, raySer
836836
// Serve applications are ready to serve incoming traffic or not. It returns two values:
837837
//
838838
// (1) `isReady` is used to determine whether the Serve applications in the RayCluster are ready to serve incoming traffic or not.
839-
// (2) `err`: If `err` is not nil, it means that KubeRay failed to get Serve application statuses from the dashboard agent. We should take a look at dashboard agent rather than Ray Serve applications.
839+
// (2) `err`: If `err` is not nil, it means that KubeRay failed to get Serve application statuses from the dashboard. We should take a look at dashboard rather than Ray Serve applications.
840840

841841
func (r *RayServiceReconciler) getAndCheckServeStatus(ctx context.Context, dashboardClient utils.RayDashboardClientInterface, rayServiceServeStatus *rayv1.RayServiceStatus) (bool, error) {
842842
logger := ctrl.LoggerFrom(ctx)
843843
var serveAppStatuses map[string]*utils.ServeApplicationStatus
844844
var err error
845845
if serveAppStatuses, err = dashboardClient.GetMultiApplicationStatus(ctx); err != nil {
846846
err = fmt.Errorf(
847-
"Failed to get Serve application statuses from the dashboard agent (the head service's port with the name `dashboard-agent`). "+
847+
"Failed to get Serve application statuses from the dashboard. "+
848848
"If you observe this error consistently, please check https://github.com/ray-project/kuberay/blob/master/docs/guidance/rayservice-troubleshooting.md for more details. "+
849849
"err: %v", err)
850850
return false, err

ray-operator/controllers/ray/utils/constant.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,11 @@ const (
6969
DefaultDashboardAgentListenPort = 52365
7070
DefaultServingPort = 8000
7171

72-
ClientPortName = "client"
73-
RedisPortName = "redis"
74-
DashboardPortName = "dashboard"
75-
MetricsPortName = "metrics"
76-
DashboardAgentListenPortName = "dashboard-agent"
77-
ServingPortName = "serve"
72+
ClientPortName = "client"
73+
RedisPortName = "redis"
74+
DashboardPortName = "dashboard"
75+
MetricsPortName = "metrics"
76+
ServingPortName = "serve"
7877

7978
// The default AppProtocol for Kubernetes service
8079
DefaultServiceAppProtocol = "tcp"

0 commit comments

Comments
 (0)