-
Notifications
You must be signed in to change notification settings - Fork 822
[History server] Update history server examples and defaults #5080
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.
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
Changes from 13 commits
7895b02
fe35cd5
65999ff
4ee49e6
e1501f1
6e5efb1
b308655
bb1e2a7
c9f2fd5
2c63b00
aa941ee
f983057
bda7aeb
9ea2bde
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,8 +16,6 @@ spec: | |
| labels: | ||
| test: raycluster-historyserver | ||
| spec: | ||
| imagePullSecrets: | ||
| affinity: | ||
| containers: | ||
| - env: | ||
| - name: RAY_TMP_ROOT | ||
|
|
@@ -29,14 +27,9 @@ spec: | |
| - name: RAY_DASHBOARD_AGGREGATOR_AGENT_EVENTS_EXPORT_ADDR | ||
| value: "http://localhost:8084/v1/events" | ||
| - name: RAY_DASHBOARD_AGGREGATOR_AGENT_EXPOSABLE_EVENT_TYPES | ||
| value: "TASK_DEFINITION_EVENT,TASK_LIFECYCLE_EVENT,ACTOR_TASK_DEFINITION_EVENT, | ||
| TASK_PROFILE_EVENT,DRIVER_JOB_DEFINITION_EVENT,DRIVER_JOB_LIFECYCLE_EVENT, | ||
| ACTOR_DEFINITION_EVENT,ACTOR_LIFECYCLE_EVENT,NODE_DEFINITION_EVENT,NODE_LIFECYCLE_EVENT" | ||
| image: rayproject/ray:2.52.0 | ||
| value: "ALL" | ||
| image: rayproject/ray:2.55.0 | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use 2.56 while we're at it? |
||
| imagePullPolicy: IfNotPresent | ||
| securityContext: | ||
| allowPrivilegeEscalation: true | ||
| privileged: true | ||
| name: ray-head | ||
| resources: | ||
| limits: | ||
|
|
@@ -52,27 +45,36 @@ spec: | |
| image: collector:v0.1.0 | ||
| imagePullPolicy: IfNotPresent | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If we use nightly, I think we need to set |
||
| env: | ||
| - name: RAY_CLUSTER_NAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.labels['ray.io/cluster'] | ||
| - name: RAY_CLUSTER_NAMESPACE | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.namespace | ||
| - name: POD_IP | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: status.podIP | ||
| - name: FQ_RAY_IP | ||
| value: raycluster-historyserver-head-svc.default.svc.cluster.local | ||
| value: $(RAY_CLUSTER_NAME)-head-svc.$(RAY_CLUSTER_NAMESPACE).svc.cluster.local | ||
| - name: RAY_TMP_ROOT | ||
| value: *rayTmpRoot | ||
| - name: RAY_ROLE | ||
| value: "Head" | ||
| - name: STORAGE_BACKEND | ||
| value: "azureblob" | ||
| - name: RAY_ROOT_DIR | ||
| value: "log" | ||
| # reference: https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite#connect-to-the-emulator-by-using-the-azure-storage-explorer | ||
| - name: AZURE_STORAGE_CONNECTION_STRING | ||
| value: "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite-service.azurite-dev.svc.cluster.local:10000/devstoreaccount1;" | ||
| - name: AZURE_STORAGE_CONTAINER | ||
| value: ray-historyserver | ||
| command: [collector, --role=Head, --runtime-class-name=azureblob, --ray-cluster-name=raycluster-historyserver, --ray-root-dir=log, --events-port=8084] | ||
| volumeMounts: | ||
| - name: historyserver | ||
| mountPath: *rayTmpRoot | ||
| tolerations: | ||
| - key: ray | ||
| operator: Equal | ||
| value: cpu | ||
| volumes: | ||
| - name: historyserver | ||
| emptyDir: {} | ||
|
|
@@ -88,7 +90,6 @@ spec: | |
| labels: | ||
| test: raycluster-historyserver | ||
| spec: | ||
| imagePullSecrets: | ||
| containers: | ||
| - env: | ||
| - name: RAY_TMP_ROOT | ||
|
|
@@ -100,15 +101,10 @@ spec: | |
| - name: RAY_DASHBOARD_AGGREGATOR_AGENT_EVENTS_EXPORT_ADDR | ||
| value: "http://localhost:8084/v1/events" | ||
| - name: RAY_DASHBOARD_AGGREGATOR_AGENT_EXPOSABLE_EVENT_TYPES | ||
| value: "TASK_DEFINITION_EVENT,TASK_LIFECYCLE_EVENT,ACTOR_TASK_DEFINITION_EVENT, | ||
| TASK_PROFILE_EVENT,DRIVER_JOB_DEFINITION_EVENT,DRIVER_JOB_LIFECYCLE_EVENT, | ||
| ACTOR_DEFINITION_EVENT,ACTOR_LIFECYCLE_EVENT,NODE_DEFINITION_EVENT,NODE_LIFECYCLE_EVENT" | ||
| image: rayproject/ray:2.52.0 | ||
| value: "ALL" | ||
| image: rayproject/ray:2.55.0 | ||
| imagePullPolicy: IfNotPresent | ||
| name: ray-worker | ||
| securityContext: | ||
| allowPrivilegeEscalation: true | ||
| privileged: true | ||
| resources: | ||
| limits: | ||
| cpu: "2" | ||
|
|
@@ -123,27 +119,36 @@ spec: | |
| image: collector:v0.1.0 | ||
| imagePullPolicy: IfNotPresent | ||
| env: | ||
| - name: RAY_CLUSTER_NAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.labels['ray.io/cluster'] | ||
| - name: RAY_CLUSTER_NAMESPACE | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.namespace | ||
| - name: POD_IP | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: status.podIP | ||
| - name: FQ_RAY_IP | ||
| value: raycluster-historyserver-head-svc.default.svc.cluster.local | ||
| value: $(RAY_CLUSTER_NAME)-head-svc.$(RAY_CLUSTER_NAMESPACE).svc.cluster.local | ||
| - name: RAY_TMP_ROOT | ||
| value: *rayTmpRoot | ||
| - name: RAY_ROLE | ||
| value: "Worker" | ||
| - name: STORAGE_BACKEND | ||
| value: "azureblob" | ||
| - name: RAY_ROOT_DIR | ||
| value: "log" | ||
| # reference: https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite#connect-to-the-emulator-by-using-the-azure-storage-explorer | ||
| - name: AZURE_STORAGE_CONNECTION_STRING | ||
| value: "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite-service.azurite-dev.svc.cluster.local:10000/devstoreaccount1;" | ||
| - name: AZURE_STORAGE_CONTAINER | ||
| value: ray-historyserver | ||
| command: [collector, --role=Worker, --runtime-class-name=azureblob, --ray-cluster-name=raycluster-historyserver, --ray-root-dir=log, --events-port=8084] | ||
| volumeMounts: | ||
| - name: historyserver | ||
| mountPath: *rayTmpRoot | ||
| tolerations: | ||
| - key: ray | ||
| operator: Equal | ||
| value: cpu | ||
| volumes: | ||
| - name: historyserver | ||
| emptyDir: {} | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| # Apply with envsubst to substitute environment variables: | ||
| # envsubst < historyserver/config/raycluster-gcs.yaml | kubectl apply -f - | ||
| apiVersion: ray.io/v1 | ||
| kind: RayCluster | ||
| metadata: | ||
|
|
@@ -17,8 +19,6 @@ spec: | |
| test: raycluster-historyserver | ||
| spec: | ||
| serviceAccountName: historyserver | ||
| imagePullSecrets: | ||
| affinity: | ||
| containers: | ||
| - env: | ||
| - name: RAY_TMP_ROOT | ||
|
|
@@ -30,14 +30,9 @@ spec: | |
| - name: RAY_DASHBOARD_AGGREGATOR_AGENT_EVENTS_EXPORT_ADDR | ||
| value: "http://localhost:8084/v1/events" | ||
| - name: RAY_DASHBOARD_AGGREGATOR_AGENT_EXPOSABLE_EVENT_TYPES | ||
| value: "TASK_DEFINITION_EVENT,TASK_LIFECYCLE_EVENT,ACTOR_TASK_DEFINITION_EVENT, | ||
| TASK_PROFILE_EVENT,DRIVER_JOB_DEFINITION_EVENT,DRIVER_JOB_LIFECYCLE_EVENT, | ||
| ACTOR_DEFINITION_EVENT,ACTOR_LIFECYCLE_EVENT,NODE_DEFINITION_EVENT,NODE_LIFECYCLE_EVENT" | ||
| image: rayproject/ray:2.52.0 | ||
| value: "ALL" | ||
| image: rayproject/ray:2.56.0 | ||
| imagePullPolicy: IfNotPresent | ||
| securityContext: | ||
| allowPrivilegeEscalation: true | ||
| privileged: true | ||
| name: ray-head | ||
| resources: | ||
| limits: | ||
|
|
@@ -53,12 +48,20 @@ spec: | |
| image: ${COLLECTOR_IMAGE} | ||
|
chiayi marked this conversation as resolved.
|
||
| imagePullPolicy: IfNotPresent | ||
| env: | ||
| - name: RAY_CLUSTER_NAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.labels['ray.io/cluster'] | ||
| - name: RAY_CLUSTER_NAMESPACE | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.namespace | ||
| - name: POD_IP | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: status.podIP | ||
| - name: FQ_RAY_IP | ||
| value: raycluster-historyserver-head-svc.default.svc.cluster.local | ||
| value: $(RAY_CLUSTER_NAME)-head-svc.$(RAY_CLUSTER_NAMESPACE).svc.cluster.local | ||
| - name: RAY_TMP_ROOT | ||
| value: *rayTmpRoot | ||
| - name: GCS_BUCKET | ||
|
|
@@ -84,20 +87,17 @@ spec: | |
| # endpoints above. Accepts Go duration format (e.g., "30s", "1m", "5m"). | ||
| - name: RAY_COLLECTOR_POLL_INTERVAL | ||
| value: "30s" | ||
| command: | ||
| - collector | ||
| - --role=Head | ||
| - --runtime-class-name=gcs | ||
| - --ray-cluster-name=${RAY_CLUSTER} | ||
| - --ray-root-dir=log | ||
| - --events-port=8084 | ||
| - name: RAY_ROLE | ||
| value: "Head" | ||
| - name: STORAGE_BACKEND | ||
| value: "gcs" | ||
| - name: RAY_ROOT_DIR | ||
| value: "storage-root" | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think there's mismatch in ray root dir. Here we use
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The What we could do is when we open a
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. SG |
||
| - name: EVENTS_PORT | ||
| value: "8084" | ||
| volumeMounts: | ||
| - name: historyserver | ||
| mountPath: *rayTmpRoot | ||
| tolerations: | ||
| - key: ray | ||
| operator: Equal | ||
| value: cpu | ||
| volumes: | ||
| - name: historyserver | ||
| emptyDir: {} | ||
|
|
@@ -125,15 +125,10 @@ spec: | |
| - name: RAY_DASHBOARD_AGGREGATOR_AGENT_EVENTS_EXPORT_ADDR | ||
| value: "http://localhost:8084/v1/events" | ||
| - name: RAY_DASHBOARD_AGGREGATOR_AGENT_EXPOSABLE_EVENT_TYPES | ||
| value: "TASK_DEFINITION_EVENT,TASK_LIFECYCLE_EVENT,ACTOR_TASK_DEFINITION_EVENT, | ||
| TASK_PROFILE_EVENT,DRIVER_JOB_DEFINITION_EVENT,DRIVER_JOB_LIFECYCLE_EVENT, | ||
| ACTOR_DEFINITION_EVENT,ACTOR_LIFECYCLE_EVENT,NODE_DEFINITION_EVENT,NODE_LIFECYCLE_EVENT" | ||
| image: rayproject/ray:2.52.0 | ||
| value: "ALL" | ||
| image: rayproject/ray:2.56.0 | ||
| imagePullPolicy: IfNotPresent | ||
| name: ray-worker | ||
| securityContext: | ||
| allowPrivilegeEscalation: true | ||
| privileged: true | ||
| resources: | ||
| limits: | ||
| cpu: "2" | ||
|
|
@@ -148,30 +143,35 @@ spec: | |
| image: ${COLLECTOR_IMAGE} | ||
| imagePullPolicy: IfNotPresent | ||
| env: | ||
| - name: RAY_CLUSTER_NAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.labels['ray.io/cluster'] | ||
| - name: RAY_CLUSTER_NAMESPACE | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: metadata.namespace | ||
| - name: POD_IP | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: status.podIP | ||
| - name: FQ_RAY_IP | ||
| value: raycluster-historyserver-head-svc.default.svc.cluster.local | ||
| value: $(RAY_CLUSTER_NAME)-head-svc.$(RAY_CLUSTER_NAMESPACE).svc.cluster.local | ||
| - name: RAY_TMP_ROOT | ||
| value: *rayTmpRoot | ||
| - name: GCS_BUCKET | ||
| value: "${GCS_BUCKET}" | ||
| command: | ||
| - collector | ||
| - --role=Worker | ||
| - --runtime-class-name=gcs | ||
| - --ray-cluster-name=${RAY_CLUSTER} | ||
| - --ray-root-dir=log | ||
| - --events-port=8084 | ||
| - name: RAY_ROLE | ||
| value: "Worker" | ||
| - name: STORAGE_BACKEND | ||
| value: "gcs" | ||
| - name: RAY_ROOT_DIR | ||
| value: "storage-root" | ||
| - name: EVENTS_PORT | ||
| value: "8084" | ||
| volumeMounts: | ||
| - name: historyserver | ||
| mountPath: *rayTmpRoot | ||
| tolerations: | ||
| - key: ray | ||
| operator: Equal | ||
| value: cpu | ||
| volumes: | ||
| - name: historyserver | ||
| emptyDir: {} | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For now can we just not set RAY_ROOT_DIR? In this case the default behavior should be using the root of the provided bucket. Or whichever subdirectory the user specifies in GCS_BUCKET
gs://my-bucket/historyserver/There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, and yes, it would just be the bucket itself is the root dir:
