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

ssh: handle concurrency issues for raw command execution #6370

Merged
merged 2 commits into from
Jul 29, 2021
Merged

ssh: handle concurrency issues for raw command execution #6370

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
d9677a6
ssh: handle concurrency issues for raw command execution
isidentical Jul 29, 2021
1aefdf0
setup: bump sshfs
isidentical Jul 29, 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
3 changes: 3 additions & 0 deletions dvc/fs/fsspec_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ def walk_files(self, path_info, **kwargs):
for file in self.find(path_info, **kwargs):
yield path_info.replace(path=file)

def move(self, from_info, to_info):
self.fs.move(self._with_bucket(from_info), self._with_bucket(to_info))

def remove(self, path_info):
self.fs.rm_file(self._with_bucket(path_info))

Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def run(self):
azure = ["adlfs==2021.7.1", "azure-identity>=1.4.0", "knack"]
# https://github.com/Legrandin/pycryptodome/issues/465
oss = ["ossfs==2021.7.5"]
ssh = ["sshfs>=2021.7.0"]
ssh = ["sshfs>=2021.7.1"]

# Remove the env marker if/when pyarrow is available for Python3.9
hdfs = ["pyarrow>=2.0.0"]
Expand All @@ -111,7 +111,7 @@ def run(self):
# for linux and mac, so it will fail to compile if user doesn't have all the
# requirements, including kerberos itself. Once all the wheels are available,
# we can start shipping it by default.
ssh_gssapi = ["sshfs[gssapi]>=2021.7.0"]
ssh_gssapi = ["sshfs[gssapi]>=2021.7.1"]
all_remotes = gs + s3 + azure + ssh + oss + gdrive + hdfs + webhdfs + webdav

tests_requirements = (
Expand Down