Skip to content

Make put_file continue on zero-read #869

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

Merged
merged 2 commits into from
Dec 22, 2021
Merged

Make put_file continue on zero-read #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f751e0
Make put_file continue on zero-read
martindurant Dec 22, 2021
d299fc4
fix test
martindurant Dec 22, 2021
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
6 changes: 3 additions & 3 deletions fsspec/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,13 +803,13 @@ def put_file(self, lpath, rpath, callback=_DEFAULT_CALLBACK, **kwargs):
return None

with open(lpath, "rb") as f1:
callback.set_size(f1.seek(0, 2))
size = f1.seek(0, 2)
callback.set_size(size)
f1.seek(0)

self.mkdirs(self._parent(os.fspath(rpath)), exist_ok=True)
with self.open(rpath, "wb", **kwargs) as f2:
data = True
while data:
while f2.tell() < size:
Copy link
Contributor

@brandon-leapyear brandon-leapyear Dec 22, 2021

Choose a reason for hiding this comment

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

why not f1.tell() < size? If f2.write() silently failed to write a chunk, then this would go into an infinite loop where f1.read() thinks it's done but f2 never gets the whole file

Copy link
Member Author

@martindurant martindurant Dec 22, 2021

Choose a reason for hiding this comment

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

Hm, that really shouldn't happen, but I'd be OK with your suggestion. Do you want to make that follow-on PR?

data = f1.read(self.blocksize)
segment_len = f2.write(data)
callback.relative_update(segment_len)
Expand Down
4 changes: 3 additions & 1 deletion fsspec/tests/test_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,9 @@ def test_dummy_callbacks_file(tmpdir):
source.write_text("x" * 100, "utf-8")

fs.put_file(source, file, callback=callback)
assert callback.events == imitate_transfer(size, 10)

# -1 here since put_file no longer has final zero-size put
assert callback.events == imitate_transfer(size, 10)[:-1]
callback.events.clear()

fs.get_file(file, destination, callback=callback)
Expand Down