mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-10 07:18:27 +01:00
- SSH number of jobs increased from 4 to 8. - `batch_exists` now opens all the SFTP sessions available to distribute the work between them. Number of sessions is restricted by the `MaxSessions` option configurable by the `sshd_config`. - Fix #2104 With the optimizations mentioned above, we increased the speed by 8x (using the default `MaxSessions` configuration -- 10). Shout-outs to @efiop, @shcheklein, and @dmpetrov for suggesting the optimization techniques.
311 lines
8.6 KiB
Python
311 lines
8.6 KiB
Python
import os
|
|
import posixpath
|
|
import logging
|
|
import stat
|
|
from contextlib import contextmanager
|
|
|
|
try:
|
|
import paramiko
|
|
except ImportError:
|
|
paramiko = None
|
|
|
|
from dvc.utils import tmp_fname
|
|
from dvc.utils.compat import ignore_file_not_found
|
|
from dvc.progress import progress
|
|
from dvc.exceptions import DvcException
|
|
from dvc.remote.base import RemoteCmdError
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def sizeof_fmt(num, suffix="B"):
|
|
""" Convert number of bytes to human-readable string """
|
|
for unit in ["", "K", "M", "G", "T", "P", "E", "Z"]:
|
|
if abs(num) < 1024.0:
|
|
return "%3.1f%s%s" % (num, unit, suffix)
|
|
num /= 1024.0
|
|
return "%.1f%s%s" % (num, "Y", suffix)
|
|
|
|
|
|
def percent_cb(name, complete, total):
|
|
""" Callback for updating target progress """
|
|
logger.debug(
|
|
"{}: {} transferred out of {}".format(
|
|
name, sizeof_fmt(complete), sizeof_fmt(total)
|
|
)
|
|
)
|
|
progress.update_target(name, complete, total)
|
|
|
|
|
|
def create_cb(name):
|
|
""" Create callback function for multipart object """
|
|
return lambda cur, tot: percent_cb(name, cur, tot)
|
|
|
|
|
|
class SSHConnection:
|
|
def __init__(self, *args, **kwargs):
|
|
self.timeout = kwargs.get("timeout", 1800)
|
|
|
|
self._ssh = paramiko.SSHClient()
|
|
self._ssh.load_system_host_keys()
|
|
self._ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
|
|
|
|
self._ssh.connect(*args, **kwargs)
|
|
self._sftp = None
|
|
self._sftp_alive = False
|
|
|
|
def __enter__(self):
|
|
return self
|
|
|
|
def __exit__(self, exception_type, exception_value, traceback):
|
|
self.close()
|
|
|
|
def _sftp_connect(self):
|
|
if not self._sftp or not self._sftp_alive:
|
|
self._sftp = self._ssh.open_sftp()
|
|
self._sftp_alive = True
|
|
|
|
def close(self):
|
|
if self._sftp:
|
|
self._sftp.close()
|
|
self._sftp_alive = False
|
|
|
|
self._ssh.close()
|
|
|
|
def st_mode(self, path):
|
|
self._sftp_connect()
|
|
|
|
with ignore_file_not_found():
|
|
return self._sftp.stat(path).st_mode
|
|
|
|
return 0
|
|
|
|
def exists(self, path, sftp=None):
|
|
return bool(self.st_mode(path))
|
|
|
|
def isdir(self, path):
|
|
return stat.S_ISDIR(self.st_mode(path))
|
|
|
|
def isfile(self, path):
|
|
return stat.S_ISREG(self.st_mode(path))
|
|
|
|
def islink(self, path):
|
|
return stat.S_ISLNK(self.st_mode(path))
|
|
|
|
def makedirs(self, path):
|
|
self._sftp_connect()
|
|
|
|
if self.isdir(path):
|
|
return
|
|
|
|
if self.isfile(path) or self.islink(path):
|
|
raise DvcException(
|
|
"a file with the same name '{}' already exists".format(path)
|
|
)
|
|
|
|
head, tail = posixpath.split(path)
|
|
|
|
if head:
|
|
self.makedirs(head)
|
|
|
|
if tail:
|
|
self._sftp.mkdir(path)
|
|
|
|
def walk(self, directory, topdown=True):
|
|
# NOTE: original os.walk() implementation [1] with default options was
|
|
# used as a template.
|
|
#
|
|
# [1] https://github.com/python/cpython/blob/master/Lib/os.py
|
|
|
|
self._sftp_connect()
|
|
|
|
try:
|
|
dir_entries = self._sftp.listdir_attr(directory)
|
|
except IOError as exc:
|
|
raise DvcException(
|
|
"couldn't get the '{}' remote directory files list".format(
|
|
directory
|
|
),
|
|
cause=exc,
|
|
)
|
|
|
|
dirs = []
|
|
nondirs = []
|
|
for entry in dir_entries:
|
|
name = entry.filename
|
|
if stat.S_ISDIR(entry.st_mode):
|
|
dirs.append(name)
|
|
else:
|
|
nondirs.append(name)
|
|
|
|
if topdown:
|
|
yield directory, dirs, nondirs
|
|
|
|
for dname in dirs:
|
|
newpath = posixpath.join(directory, dname)
|
|
for entry in self.walk(newpath, topdown=topdown):
|
|
yield entry
|
|
|
|
if not topdown:
|
|
yield directory, dirs, nondirs
|
|
|
|
def walk_files(self, directory):
|
|
for root, dirs, files in self.walk(directory):
|
|
for fname in files:
|
|
yield posixpath.join(root, fname)
|
|
|
|
def _remove_file(self, path):
|
|
with ignore_file_not_found():
|
|
self._sftp.remove(path)
|
|
|
|
def _remove_dir(self, path):
|
|
for root, dirs, files in self.walk(path, topdown=False):
|
|
for fname in files:
|
|
path = posixpath.join(root, fname)
|
|
self._remove_file(path)
|
|
|
|
for dname in dirs:
|
|
path = posixpath.join(root, dname)
|
|
self._sftp.rmdir(dname)
|
|
|
|
with ignore_file_not_found():
|
|
self._sftp.rmdir(path)
|
|
|
|
def remove(self, path):
|
|
self._sftp_connect()
|
|
|
|
if self.isdir(path):
|
|
self._remove_dir(path)
|
|
else:
|
|
self._remove_file(path)
|
|
|
|
def download(self, src, dest, no_progress_bar=False, progress_title=None):
|
|
self._sftp_connect()
|
|
|
|
if no_progress_bar:
|
|
self._sftp.get(src, dest)
|
|
else:
|
|
if not progress_title:
|
|
progress_title = os.path.basename(src)
|
|
|
|
self._sftp.get(src, dest, callback=create_cb(progress_title))
|
|
progress.finish_target(progress_title)
|
|
|
|
def move(self, src, dst):
|
|
self.makedirs(posixpath.dirname(dst))
|
|
self._sftp_connect()
|
|
self._sftp.rename(src, dst)
|
|
|
|
def upload(self, src, dest, no_progress_bar=False, progress_title=None):
|
|
self._sftp_connect()
|
|
|
|
self.makedirs(posixpath.dirname(dest))
|
|
tmp_file = tmp_fname(dest)
|
|
|
|
if no_progress_bar:
|
|
self._sftp.put(src, tmp_file)
|
|
else:
|
|
if not progress_title:
|
|
progress_title = posixpath.basename(dest)
|
|
|
|
self._sftp.put(src, tmp_file, callback=create_cb(progress_title))
|
|
progress.finish_target(progress_title)
|
|
|
|
self._sftp.rename(tmp_file, dest)
|
|
|
|
def execute(self, cmd):
|
|
stdin, stdout, stderr = self._ssh.exec_command(cmd)
|
|
channel = stdout.channel
|
|
|
|
stdin.close()
|
|
channel.shutdown_write()
|
|
|
|
stdout_chunks = []
|
|
stderr_chunks = []
|
|
while (
|
|
not channel.closed
|
|
or channel.recv_ready()
|
|
or channel.recv_stderr_ready()
|
|
):
|
|
import select
|
|
|
|
got_chunk = False
|
|
readq, _, _ = select.select([stdout.channel], [], [], self.timeout)
|
|
for c in readq:
|
|
if c.recv_ready():
|
|
stdout_chunks.append(stdout.channel.recv(len(c.in_buffer)))
|
|
got_chunk = True
|
|
|
|
if c.recv_stderr_ready():
|
|
stderr_len = len(c.in_stderr_buffer)
|
|
s = stderr.channel.recv_stderr(stderr_len)
|
|
stderr_chunks.append(s)
|
|
got_chunk = True
|
|
|
|
if (
|
|
not got_chunk
|
|
and stdout.channel.exit_status_ready()
|
|
and not stderr.channel.recv_stderr_ready()
|
|
and not stdout.channel.recv_ready()
|
|
):
|
|
stdout.channel.shutdown_read()
|
|
stdout.channel.close()
|
|
break
|
|
|
|
stdout.close()
|
|
stderr.close()
|
|
|
|
ret = stdout.channel.recv_exit_status()
|
|
if ret != 0:
|
|
err = b"".join(stderr_chunks).decode("utf-8")
|
|
raise RemoteCmdError("ssh", cmd, ret, err)
|
|
|
|
return b"".join(stdout_chunks).decode("utf-8")
|
|
|
|
def md5(self, path):
|
|
"""
|
|
Use different md5 commands depending on the OS:
|
|
|
|
- Darwin's `md5` returns BSD-style checksums by default
|
|
- Linux's `md5sum` needs the `--tag` flag for a similar output
|
|
|
|
Example:
|
|
MD5 (foo.txt) = f3d220a856b52aabbf294351e8a24300
|
|
"""
|
|
uname = self.execute("uname").strip()
|
|
|
|
command = {
|
|
"Darwin": "md5 {}".format(path),
|
|
"Linux": "md5sum --tag {}".format(path),
|
|
}.get(uname)
|
|
|
|
if not command:
|
|
raise DvcException(
|
|
"'{uname}' is not supported as a remote".format(uname=uname)
|
|
)
|
|
|
|
md5 = self.execute(command).split()[-1]
|
|
assert len(md5) == 32
|
|
return md5
|
|
|
|
def cp(self, src, dest):
|
|
self.makedirs(posixpath.dirname(dest))
|
|
self.execute("cp {} {}".format(src, dest))
|
|
|
|
@contextmanager
|
|
def open_max_sftp_channels(self):
|
|
try:
|
|
channels = []
|
|
while True:
|
|
try:
|
|
channels.append(self._ssh.open_sftp())
|
|
except paramiko.ssh_exception.ChannelException:
|
|
if not channels:
|
|
raise
|
|
break
|
|
yield channels
|
|
finally:
|
|
for channel in channels:
|
|
channel.close()
|