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.

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

Preserve ray/serve/generated when creating softlink for serve package #48793

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

mimiliaogo
Copy link
Contributor

Why are these changes needed?

This PR modifies the setup-dev.py script to preserve ray/serve/generated folder during the symlink creation process. Specifically:

  • Before creating the symbolic link for serve, the existing generated folder is copied to a temporary location.
  • After the symlink is created, the generated folder is moved back to its original location, ensuring that the generated files are preserved and not overwritten by the symlink.

Related issue number

Closes #48792

Checks

  • I've signed off every commit(by using the -s flag, i.e., git commit -s) in this PR.
  • I've run scripts/format.sh to lint the changes in this PR.
  • I've included any doc changes needed for https://docs.ray.io/en/master/.
    • I've added any new APIs to the API Reference. For example, if I added a
      method in Tune, I've added it in doc/source/tune/api/ under the
      corresponding .rst file.
  • I've made sure the tests are passing. Note that there might be a few flaky tests, see the recent failures at https://flakey-tests.ray.io/
  • Testing Strategy
    • Unit tests
    • Release tests
    • This PR is not tested :(

Signed-off-by: Mimi Liao <mimiliao2000@gmail.com>
@jcotant1 jcotant1 added the serve Ray Serve Related Issue label Nov 19, 2024
if package == "serve":
# Copy generated folder to a temp dir
generated_folder = os.path.join(package_home, "generated")
temp_dir = "/tmp/ray/"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
temp_dir = "/tmp/ray/"
temp_dir = "/tmp/ray/_serve/"

Copy link
Contributor

Choose a reason for hiding this comment

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

To avoid collisions with other libs

subprocess.check_call(sudo + ["rm", "-rf", package_home])
subprocess.check_call(sudo + ["ln", "-s", local_home, package_home])

# Move generated folder to local_home
if package == "serve":
tmp_generated_folder = "/tmp/ray/generated"
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's reuse var from previous conditional

Signed-off-by: Mimi Liao <mimiliao2000@gmail.com>
@richardliaw richardliaw enabled auto-merge (squash) November 20, 2024 19:32
@github-actions github-actions bot added the go add ONLY when ready to merge, run all tests label Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
go add ONLY when ready to merge, run all tests serve Ray Serve Related Issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ray/serve/generated file is missing after running setup-dev.py
4 participants