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

Jump to bottom

[autoscaler] Make log file mount path more specific. #391

Merged
merged 4 commits into from
Jul 20, 2022
Merged

[autoscaler] Make log file mount path more specific. #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
302fe65
Fix log path.
DmitriGekhtman Jul 19, 2022
f7116c6
Rerun CI.
DmitriGekhtman Jul 20, 2022
a5a49a7
Fix test.
DmitriGekhtman Jul 20, 2022
e88c743
Rerun CI.
DmitriGekhtman Jul 20, 2022
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
10 changes: 7 additions & 3 deletions ray-operator/config/crd/bases/ray.io_rayjobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ spec:
Important: Run "make" to regenerate code af'
type: string
jobId:
description: If jobId is not set, a new jobId will be auto-generated.
type: string
metadata:
additionalProperties:
type: string
description: Metadata is data to store along with this job.
type: object
rayClusterSpec:
description: 'EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
Expand Down Expand Up @@ -97,7 +99,7 @@ spec:
type: object
type: object
upscalingMode:
description: UpscalineMode is "Default" or "Aggressive.
description: UpscalingMode is "Default" or "Aggressive.
enum:
- Default
- Aggressive
Expand All @@ -122,7 +124,8 @@ spec:
node-manager-port, object-store-memory, ...'
type: object
replicas:
description: Number of desired pods in this pod group.
description: HeadGroupSpec.Replicas is deprecated and ignored;
there can only be one head pod per Ray cluster.
format: int32
type: integer
serviceType:
Expand Down Expand Up @@ -5723,7 +5726,6 @@ spec:
type: object
required:
- rayStartParams
- replicas
- serviceType
- template
type: object
Expand Down Expand Up @@ -11491,6 +11493,8 @@ spec:
description: RuntimeEnv is base64 encoded.
type: string
shutdownAfterJobFinishes:
description: 'TODO: If set to true, the rayCluster will be deleted
after the rayJob finishes'
type: boolean
required:
- entrypoint
Expand Down
2 changes: 1 addition & 1 deletion ray-operator/controllers/ray/common/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const (
SharedMemoryVolumeName = "shared-mem"
SharedMemoryVolumeMountPath = "/dev/shm"
RayLogVolumeName = "ray-logs"
RayLogVolumeMountPath = "/tmp/ray"
RayLogVolumeMountPath = "/tmp/ray/session_latest/logs"
AutoscalerContainerName = "autoscaler"
RayHeadContainer = "ray-head"
ObjectStoreMemoryKey = "object-store-memory"
Expand Down
4 changes: 2 additions & 2 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 @@ -174,7 +174,7 @@ var volumeMountsWithAutoscaler = []v1.VolumeMount{
},
{
Name: "ray-logs",
MountPath: "/tmp/ray",
MountPath: "/tmp/ray/session_latest/logs",
ReadOnly: false,
},
}
Expand Down Expand Up @@ -223,7 +223,7 @@ var autoscalerContainer = v1.Container{
},
VolumeMounts: []v1.VolumeMount{
{
MountPath: "/tmp/ray",
MountPath: "/tmp/ray/session_latest/logs",
Name: "ray-logs",
},
},
Expand Down