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

fix: directory creation on pulling data #10580

Merged
merged 2 commits into from
Oct 8, 2024

Conversation

sssilvar
Copy link
Contributor

@sssilvar sssilvar commented Oct 3, 2024

Closes #10579

@shcheklein shcheklein requested a review from skshetry October 3, 2024 20:48
dvc/fs/dvc.py Outdated
@@ -571,7 +571,7 @@ def _get( # noqa: C901, PLR0912

os.makedirs(lpath, exist_ok=True)
for d in _dirs:
os.mkdir(d)
os.mkdir(d, exist_ok=True)
Copy link
Member

Choose a reason for hiding this comment

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

There is no exist_ok=True in os.mkdir. That is in os.makedirs.

This should either be:

Suggested change
os.mkdir(d, exist_ok=True)
try:
os.mkdir(d)
except OSError:
if not os.path.isdir(d):
raise

or,

Suggested change
os.mkdir(d, exist_ok=True)
os.makedirs(d, exist_ok=True)

I'd prefer the first one as makedirs calls os.path.exists() on all the parents of the path.

Copy link
Member

Choose a reason for hiding this comment

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

Any reason why you did not go with the first option?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Less verbose, atomicity and clarity.

@skshetry
Copy link
Member

skshetry commented Oct 4, 2024

Hi, thank you for contributing. The tests and the linter is failing, please take a look at https://dvc.org/doc/contributing/core on how to run tests and fix linter issues. Please feel free to ask if you need any help. :)

@sssilvar sssilvar force-pushed the fix/handle-existing-dir branch from 065f322 to 85a0f83 Compare October 7, 2024 21:34
@sssilvar
Copy link
Contributor Author

sssilvar commented Oct 7, 2024

Thanks @skshetry for your feedback. Code's been updated. However somehow CI fails when running benchmars astral-sh/setup-uv@v3: https://github.com/iterative/dvc/actions/runs/11224357089/job/31200911385?pr=10580

Proposed a fix in 1e268fa

@sssilvar sssilvar requested a review from skshetry October 8, 2024 07:32
Copy link
Member

@skshetry skshetry left a comment

Choose a reason for hiding this comment

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

LGTM although I am a bit concerned with performance issues with makedirs (stat calls can be expensive). But let's go with this one for now, we'll revisit if I find it to be the culprit.

Also, thank you for fixing the benchmarks workflow.

@skshetry skshetry merged commit c1aaeff into iterative:main Oct 8, 2024
26 checks passed
petebachant pushed a commit to petebachant/dvc that referenced this pull request Oct 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pull with Python API: raises error when directory exists during data pull with python api
2 participants