Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions ray-operator/rayjob-submitter/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ func main() {
}
rayDashboardClient := &dashboardclient.RayDashboardClient{}
address = rayjobsubmitter.JobSubmissionURL(address)
rayDashboardClient.InitClient(&http.Client{Timeout: time.Second * 10}, address, "")
authToken := os.Getenv("RAY_AUTH_TOKEN")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RAY_AUTH_TOKEN_ENV_VAR

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think hard-coding the name here is acceptable for now, since importing the entire utils package could significantly increase the submitter size.

rayDashboardClient.InitClient(&http.Client{Timeout: time.Second * 10}, address, authToken)
submissionId, err := rayDashboardClient.SubmitJobReq(context.Background(), &req)
if err != nil {
if strings.Contains(err.Error(), "Please use a different submission_id") {
Expand All @@ -76,7 +77,7 @@ func main() {
fmt.Fprintf(os.Stdout, "SUCC -- Job '%s' submitted successfully\n", submissionId)
}
fmt.Fprintf(os.Stdout, "INFO -- Tailing logs until the job finishes:\n")
err = rayjobsubmitter.TailJobLogs(address, submissionId, os.Stdout)
err = rayjobsubmitter.TailJobLogs(address, submissionId, authToken, os.Stdout)
exitOnError(err)
}

Expand Down
14 changes: 12 additions & 2 deletions ray-operator/rayjob-submitter/rayjob-submitter.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,22 @@ func logTailingURL(address, submissionId string) (string, error) {
return address, nil
}

func TailJobLogs(address, submissionId string, out io.Writer) error {
func TailJobLogs(address, submissionId string, authToken string, out io.Writer) error {
wsAddr, err := logTailingURL(address, submissionId)
if err != nil {
return err
}
c, _, err := websocket.Dial(context.Background(), wsAddr, nil)

var dialOptions *websocket.DialOptions
if authToken != "" {
dialOptions = &websocket.DialOptions{
HTTPHeader: map[string][]string{
"X-Ray-Authorization": {fmt.Sprintf("Bearer %s", authToken)},
},
}
}

c, _, err := websocket.Dial(context.Background(), wsAddr, dialOptions)
if err != nil {
return err
}
Expand Down
Loading