X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44ea4c89930d52d142da2c0b7204fd34f61f8f39..c3d4f8a585202ec58df5506934b698039c200b68:/sdk/python/arvados/commands/put.py diff --git a/sdk/python/arvados/commands/put.py b/sdk/python/arvados/commands/put.py old mode 100755 new mode 100644 index dffa576957..5b46ba75b7 --- a/sdk/python/arvados/commands/put.py +++ b/sdk/python/arvados/commands/put.py @@ -7,19 +7,24 @@ import argparse import arvados import arvados.collection import base64 +import copy import datetime import errno import fcntl import hashlib import json +import logging import os import pwd -import time +import re import signal import socket import sys import tempfile +import threading +import time from apiclient import errors as apiclient_errors +from arvados._version import __version__ import arvados.commands._util as arv_cmd @@ -28,6 +33,9 @@ api_client = None upload_opts = argparse.ArgumentParser(add_help=False) +upload_opts.add_argument('--version', action='version', + version="%s %s" % (sys.argv[0], __version__), + help='Print version and exit.') upload_opts.add_argument('paths', metavar='path', type=str, nargs='*', help=""" Local file or directory. Default: read from standard input. @@ -36,13 +44,7 @@ Local file or directory. Default: read from standard input. _group = upload_opts.add_mutually_exclusive_group() _group.add_argument('--max-manifest-depth', type=int, metavar='N', - default=-1, help=""" -Maximum depth of directory tree to represent in the manifest -structure. A directory structure deeper than this will be represented -as a single stream in the manifest. If N=0, the manifest will contain -a single stream. Default: -1 (unlimited), i.e., exactly one manifest -stream per filesystem directory that contains files. -""") + default=-1, help=argparse.SUPPRESS) _group.add_argument('--normalize', action='store_true', help=""" @@ -50,6 +52,12 @@ Normalize the manifest by re-ordering files and streams after writing data. """) +_group.add_argument('--dry-run', action='store_true', default=False, + help=""" +Don't actually upload files, but only check if any file should be +uploaded. Exit with code=2 when files are pending for upload. +""") + _group = upload_opts.add_mutually_exclusive_group() _group.add_argument('--as-stream', action='store_true', dest='stream', @@ -93,6 +101,12 @@ separated by commas, with a trailing newline. Do not store a manifest. """) +upload_opts.add_argument('--update-collection', type=str, default=None, + dest='update_collection', metavar="UUID", help=""" +Update an existing collection identified by the given Arvados collection +UUID. All new local files will be uploaded. +""") + upload_opts.add_argument('--use-filename', type=str, default=None, dest='filename', help=""" Synonym for --filename. @@ -119,6 +133,15 @@ physical storage devices (e.g., disks) should have a copy of each data block. Default is to use the server-provided default (if any) or 2. """) +upload_opts.add_argument('--threads', type=int, metavar='N', default=None, + help=""" +Set the number of upload threads to be used. Take into account that +using lots of threads will increase the RAM requirements. Default is +to use 2 threads. +On high latency installations, using a greater number will improve +overall throughput. +""") + run_opts = argparse.ArgumentParser(add_help=False) run_opts.add_argument('--project-uuid', metavar='UUID', help=""" @@ -160,6 +183,16 @@ _group.add_argument('--no-resume', action='store_false', dest='resume', Do not continue interrupted uploads from cached state. """) +_group = run_opts.add_mutually_exclusive_group() +_group.add_argument('--cache', action='store_true', dest='use_cache', default=True, + help=""" +Save upload state in a cache file for resuming (default). +""") +_group.add_argument('--no-cache', action='store_false', dest='use_cache', + help=""" +Do not save upload state in a cache file for resuming. +""") + arg_parser = argparse.ArgumentParser( description='Copy data from the local filesystem to Keep.', parents=[upload_opts, run_opts, arv_cmd.retry_opt]) @@ -184,17 +217,54 @@ def parse_arguments(arguments): and os.isatty(sys.stderr.fileno())): args.progress = True + # Turn off --resume (default) if --no-cache is used. + if not args.use_cache: + args.resume = False + if args.paths == ['-']: + if args.update_collection: + arg_parser.error(""" + --update-collection cannot be used when reading from stdin. + """) args.resume = False + args.use_cache = False if not args.filename: args.filename = 'stdin' return args + +class CollectionUpdateError(Exception): + pass + + class ResumeCacheConflict(Exception): pass +class ArvPutArgumentConflict(Exception): + pass + + +class ArvPutUploadIsPending(Exception): + pass + + +class ArvPutUploadNotPending(Exception): + pass + + +class FileUploadList(list): + def __init__(self, dry_run=False): + list.__init__(self) + self.dry_run = dry_run + + def append(self, other): + if self.dry_run: + raise ArvPutUploadIsPending() + super(FileUploadList, self).append(other) + + class ResumeCache(object): CACHE_DIR = '.cache/arvados/arv-put' @@ -210,7 +280,7 @@ class ResumeCache(object): realpaths = sorted(os.path.realpath(path) for path in args.paths) md5.update('\0'.join(realpaths)) if any(os.path.isdir(path) for path in realpaths): - md5.update(str(max(args.max_manifest_depth, -1))) + md5.update("-1") elif args.filename: md5.update(args.filename) return os.path.join( @@ -277,91 +347,349 @@ class ResumeCache(object): self.__init__(self.filename) -class ArvPutCollectionCache(object): +class ArvPutUploadJob(object): CACHE_DIR = '.cache/arvados/arv-put' - - def __init__(self, paths): - md5 = hashlib.md5() - md5.update(arvados.config.get('ARVADOS_API_HOST', '!nohost')) - realpaths = sorted(os.path.realpath(path) for path in paths) - self.files = {} - for path in realpaths: - self._get_file_data(path) - # Only hash args paths - self.cache_hash = md5.update('\0'.join(realpaths)) - self.cache_file = open(os.path.join(self.CACHE_DIR, self.cache_hash), 'a+') - self._lock_file(self.cache_file) - self.filename = self.cache_file.name - self.data = self._load() - - def _load(self): + EMPTY_STATE = { + 'manifest' : None, # Last saved manifest checkpoint + 'files' : {} # Previous run file list: {path : {size, mtime}} + } + + def __init__(self, paths, resume=True, use_cache=True, reporter=None, + bytes_expected=None, name=None, owner_uuid=None, + ensure_unique_name=False, num_retries=None, + put_threads=None, replication_desired=None, + filename=None, update_time=60.0, update_collection=None, + logger=logging.getLogger('arvados.arv_put'), dry_run=False): + self.paths = paths + self.resume = resume + self.use_cache = use_cache + self.update = False + self.reporter = reporter + self.bytes_expected = bytes_expected + self.bytes_written = 0 + self.bytes_skipped = 0 + self.name = name + self.owner_uuid = owner_uuid + self.ensure_unique_name = ensure_unique_name + self.num_retries = num_retries + self.replication_desired = replication_desired + self.put_threads = put_threads + self.filename = filename + self._state_lock = threading.Lock() + self._state = None # Previous run state (file list & manifest) + self._current_files = [] # Current run file list + self._cache_file = None + self._collection_lock = threading.Lock() + self._remote_collection = None # Collection being updated (if asked) + self._local_collection = None # Collection from previous run manifest + self._file_paths = [] # Files to be updated in remote collection + self._stop_checkpointer = threading.Event() + self._checkpointer = threading.Thread(target=self._update_task) + self._checkpointer.daemon = True + self._update_task_time = update_time # How many seconds wait between update runs + self._files_to_upload = FileUploadList(dry_run=dry_run) + self.logger = logger + self.dry_run = dry_run + + if not self.use_cache and self.resume: + raise ArvPutArgumentConflict('resume cannot be True when use_cache is False') + + # Check for obvious dry-run responses + if self.dry_run and (not self.use_cache or not self.resume): + raise ArvPutUploadIsPending() + + # Load cached data if any and if needed + self._setup_state(update_collection) + + def start(self, save_collection): + """ + Start supporting thread & file uploading + """ + if not self.dry_run: + self._checkpointer.start() try: - self.cache_file.seek(0) - ret = json.load(self.cache_file) - except ValueError: - # File empty, set up new cache - ret = { - 'col_uuid' : None, # Collection UUID - 'uploaded' : [], # Uploaded file - 'files': {}, # Complete cached file (path, mtime, size) list - } - return ret - - def set_collection(self, uuid): - self.data['col_uuid'] = uuid - - def collection(self): - return self.data['col_uuid'] - - def is_dirty(self, path): - if (self.files[path]['mtime'] != self.data['files'][path]['mtime']) or - (self.files[path]['size'] != self.data['files'][path]['size']): - return True + for path in self.paths: + # Test for stdin first, in case some file named '-' exist + if path == '-': + if self.dry_run: + raise ArvPutUploadIsPending() + self._write_stdin(self.filename or 'stdin') + elif os.path.isdir(path): + # Use absolute paths on cache index so CWD doesn't interfere + # with the caching logic. + prefixdir = path = os.path.abspath(path) + if prefixdir != '/': + prefixdir += '/' + for root, dirs, files in os.walk(path): + # Make os.walk()'s dir traversing order deterministic + dirs.sort() + files.sort() + for f in files: + self._check_file(os.path.join(root, f), + os.path.join(root[len(prefixdir):], f)) + else: + self._check_file(os.path.abspath(path), + self.filename or os.path.basename(path)) + # If dry-mode is on, and got up to this point, then we should notify that + # there aren't any file to upload. + if self.dry_run: + raise ArvPutUploadNotPending() + # Remove local_collection's files that don't exist locally anymore, so the + # bytes_written count is correct. + for f in self.collection_file_paths(self._local_collection, + path_prefix=""): + if f != 'stdin' and f != self.filename and not f in self._file_paths: + self._local_collection.remove(f) + # Update bytes_written from current local collection and + # report initial progress. + self._update() + # Actual file upload + self._upload_files() + finally: + if not self.dry_run: + # Stop the thread before doing anything else + self._stop_checkpointer.set() + self._checkpointer.join() + # Commit all pending blocks & one last _update() + self._local_collection.manifest_text() + self._update(final=True) + if save_collection: + self.save_collection() + if self.use_cache: + self._cache_file.close() + + def save_collection(self): + if self.update: + # Check if files should be updated on the remote collection. + for fp in self._file_paths: + remote_file = self._remote_collection.find(fp) + if not remote_file: + # File don't exist on remote collection, copy it. + self._remote_collection.copy(fp, fp, self._local_collection) + elif remote_file != self._local_collection.find(fp): + # A different file exist on remote collection, overwrite it. + self._remote_collection.copy(fp, fp, self._local_collection, overwrite=True) + else: + # The file already exist on remote collection, skip it. + pass + self._remote_collection.save(num_retries=self.num_retries) else: - return False - - - def dirty_files(self): + self._local_collection.save_new( + name=self.name, owner_uuid=self.owner_uuid, + ensure_unique_name=self.ensure_unique_name, + num_retries=self.num_retries) + + def destroy_cache(self): + if self.use_cache: + try: + os.unlink(self._cache_filename) + except OSError as error: + # That's what we wanted anyway. + if error.errno != errno.ENOENT: + raise + self._cache_file.close() + + def _collection_size(self, collection): + """ + Recursively get the total size of the collection + """ + size = 0 + for item in collection.values(): + if isinstance(item, arvados.collection.Collection) or isinstance(item, arvados.collection.Subcollection): + size += self._collection_size(item) + else: + size += item.size() + return size + + def _update_task(self): """ - Files that were previously uploaded but changed locally between - upload runs. These files should be re-uploaded. + Periodically called support task. File uploading is + asynchronous so we poll status from the collection. """ - dirty = [] - for f in self.data['uploaded']: - if self.is_dirty(f): - dirty.append(f) - return dirty - - def uploaded_files(self): + while not self._stop_checkpointer.wait(self._update_task_time): + self._update() + + def _update(self, final=False): """ - Files that were uploaded and have not changed locally between - upload runs. These files should be checked for partial uploads + Update cached manifest text and report progress. """ - uploaded = [] - for f in self.data['uploaded']: - if not self.is_dirty(f): - uploaded.append(f) - return uploaded - - def pending_files(self): + with self._collection_lock: + self.bytes_written = self._collection_size(self._local_collection) + if self.use_cache: + if final: + manifest = self._local_collection.manifest_text() + else: + # Get the manifest text without comitting pending blocks + manifest = self._local_collection.manifest_text(strip=False, + normalize=False, + only_committed=True) + # Update cache + with self._state_lock: + self._state['manifest'] = manifest + if self.use_cache: + self._save_state() + # Call the reporter, if any + self.report_progress() + + def report_progress(self): + if self.reporter is not None: + self.reporter(self.bytes_written, self.bytes_expected) + + def _write_stdin(self, filename): + output = self._local_collection.open(filename, 'w') + self._write(sys.stdin, output) + output.close() + + def _check_file(self, source, filename): + """Check if this file needs to be uploaded""" + resume_offset = 0 + should_upload = False + new_file_in_cache = False + # Record file path for updating the remote collection before exiting + self._file_paths.append(filename) + + with self._state_lock: + # If no previous cached data on this file, store it for an eventual + # repeated run. + if source not in self._state['files']: + self._state['files'][source] = { + 'mtime': os.path.getmtime(source), + 'size' : os.path.getsize(source) + } + new_file_in_cache = True + cached_file_data = self._state['files'][source] + + # Check if file was already uploaded (at least partially) + file_in_local_collection = self._local_collection.find(filename) + + # If not resuming, upload the full file. + if not self.resume: + should_upload = True + # New file detected from last run, upload it. + elif new_file_in_cache: + should_upload = True + # Local file didn't change from last run. + elif cached_file_data['mtime'] == os.path.getmtime(source) and cached_file_data['size'] == os.path.getsize(source): + if not file_in_local_collection: + # File not uploaded yet, upload it completely + should_upload = True + elif file_in_local_collection.permission_expired(): + # Permission token expired, re-upload file. This will change whenever + # we have a API for refreshing tokens. + should_upload = True + self._local_collection.remove(filename) + elif cached_file_data['size'] == file_in_local_collection.size(): + # File already there, skip it. + self.bytes_skipped += cached_file_data['size'] + elif cached_file_data['size'] > file_in_local_collection.size(): + # File partially uploaded, resume! + resume_offset = file_in_local_collection.size() + self.bytes_skipped += resume_offset + should_upload = True + else: + # Inconsistent cache, re-upload the file + should_upload = True + self._local_collection.remove(filename) + self.logger.warning("Uploaded version of file '{}' is bigger than local version, will re-upload it from scratch.".format(source)) + # Local file differs from cached data, re-upload it. + else: + if file_in_local_collection: + self._local_collection.remove(filename) + should_upload = True + + if should_upload: + self._files_to_upload.append((source, resume_offset, filename)) + + def _upload_files(self): + for source, resume_offset, filename in self._files_to_upload: + with open(source, 'r') as source_fd: + with self._state_lock: + self._state['files'][source]['mtime'] = os.path.getmtime(source) + self._state['files'][source]['size'] = os.path.getsize(source) + if resume_offset > 0: + # Start upload where we left off + output = self._local_collection.open(filename, 'a') + source_fd.seek(resume_offset) + else: + # Start from scratch + output = self._local_collection.open(filename, 'w') + self._write(source_fd, output) + output.close(flush=False) + + def _write(self, source_fd, output): + while True: + data = source_fd.read(arvados.config.KEEP_BLOCK_SIZE) + if not data: + break + output.write(data) + + def _my_collection(self): + return self._remote_collection if self.update else self._local_collection + + def _setup_state(self, update_collection): """ - Files that should be uploaded, because they're dirty or thet - never had the chance to be uploaded yet. + Create a new cache file or load a previously existing one. """ - pending = [] - uploaded = self.uploaded_files() - for f in self.files.keys(): - if f not in uploaded: - pending.append(f) - return pending - - def _get_file_data(self, path): - if os.path.isfile(path): - self.files[path] = {'mtime': os.path.getmtime(path), - 'size': os.path.getsize(path)} - elif os.path.isdir(path): - for item in os.listdir(path): - self._get_file_data(os.path.join(path, item)) + # Load an already existing collection for update + if update_collection and re.match(arvados.util.collection_uuid_pattern, + update_collection): + try: + self._remote_collection = arvados.collection.Collection(update_collection) + except arvados.errors.ApiError as error: + raise CollectionUpdateError("Cannot read collection {} ({})".format(update_collection, error)) + else: + self.update = True + elif update_collection: + # Collection locator provided, but unknown format + raise CollectionUpdateError("Collection locator unknown: '{}'".format(update_collection)) + + if self.use_cache: + # Set up cache file name from input paths. + md5 = hashlib.md5() + md5.update(arvados.config.get('ARVADOS_API_HOST', '!nohost')) + realpaths = sorted(os.path.realpath(path) for path in self.paths) + md5.update('\0'.join(realpaths)) + if self.filename: + md5.update(self.filename) + cache_filename = md5.hexdigest() + cache_filepath = os.path.join( + arv_cmd.make_home_conf_dir(self.CACHE_DIR, 0o700, 'raise'), + cache_filename) + if self.resume: + self._cache_file = open(cache_filepath, 'a+') + else: + # --no-resume means start with a empty cache file. + self._cache_file = open(cache_filepath, 'w+') + self._cache_filename = self._cache_file.name + self._lock_file(self._cache_file) + self._cache_file.seek(0) + + with self._state_lock: + if self.use_cache: + try: + self._state = json.load(self._cache_file) + if not set(['manifest', 'files']).issubset(set(self._state.keys())): + # Cache at least partially incomplete, set up new cache + self._state = copy.deepcopy(self.EMPTY_STATE) + except ValueError: + # Cache file empty, set up new cache + self._state = copy.deepcopy(self.EMPTY_STATE) + else: + # No cache file, set empty state + self._state = copy.deepcopy(self.EMPTY_STATE) + # Load the previous manifest so we can check if files were modified remotely. + self._local_collection = arvados.collection.Collection(self._state['manifest'], replication_desired=self.replication_desired, put_threads=self.put_threads) + + def collection_file_paths(self, col, path_prefix='.'): + """Return a list of file paths by recursively go through the entire collection `col`""" + file_paths = [] + for name, item in col.items(): + if isinstance(item, arvados.arvfile.ArvadosFile): + file_paths.append(os.path.join(path_prefix, name)) + elif isinstance(item, arvados.collection.Subcollection): + new_prefix = os.path.join(path_prefix, name) + file_paths += self.collection_file_paths(item, path_prefix=new_prefix) + return file_paths def _lock_file(self, fileobj): try: @@ -369,174 +697,72 @@ class ArvPutCollectionCache(object): except IOError: raise ResumeCacheConflict("{} locked".format(fileobj.name)) - -class ArvPutUploader(object): - def __init__(self, paths): - self.cache = ArvPutCollectionCache(paths) - if self.cache.collection() is not None: - self.collection = ArvPutCollection(locator=self.cache.collection(), cache=self.cache) - else: - self.collection = ArvPutCollection(cache=self.cache) - self.cache.set_collection(self.collection.locator()) - - # # Remove uploaded 'dirty' files from collection - # for f in self.cache.dirty_files(): - # self.collection.remove_file(f) - # - # # Upload pending files - # for f in self.cache.pending_files(): - # self.collection.write_file(f, os.path.join('.', f)) - # self.cache.file_uploaded(f) #TODO - - for p in paths: - if os.path.isdir(p): - self.collection.write_directory_tree(p) - elif os.path.isfile(p): - self.collection.write_file(p) - - -class ArvPutCollection(object): - def __init__(self, locator = None, cache=None, reporter=None, - bytes_expected=None, **kwargs): - self.collection_flush_time = 60 - self.bytes_written = 0 - self._seen_inputs = [] - self.cache = cache - self.reporter = reporter - self.bytes_expected = bytes_expected - - if locator is None: - self.collection = arvados.collection.Collection() - self.collection.save_new() + def _save_state(self): + """ + Atomically save current state into cache. + """ + try: + with self._state_lock: + state = copy.deepcopy(self._state) + new_cache_fd, new_cache_name = tempfile.mkstemp( + dir=os.path.dirname(self._cache_filename)) + self._lock_file(new_cache_fd) + new_cache = os.fdopen(new_cache_fd, 'r+') + json.dump(state, new_cache) + new_cache.flush() + os.fsync(new_cache) + os.rename(new_cache_name, self._cache_filename) + except (IOError, OSError, ResumeCacheConflict) as error: + self.logger.error("There was a problem while saving the cache file: {}".format(error)) + try: + os.unlink(new_cache_name) + except NameError: # mkstemp failed. + pass else: - self.collection = arvados.collection.Collection(locator) - - def write_file(self, source, filename): - if source in self.cache.dirty_files(): - print "DIRTY: Removing file %s to be uploaded again" % source - self.collection.remove(filename) - elif source in self.cache.uploaded_files(): - # TODO: Check for partial uploads - pass - - # if not source in self.cache.pending_files(): - # print "WARNING: file %s already uploaded, skipping!" % source - # return - - print "Writing file, source: %s, filename: %s" % (source, filename) - with self.collection as c: - with open(source, 'r') as source_fd: - output = c.open(filename, 'w') - start_time = time.time() - while True: - data = source_fd.read(arvados.config.KEEP_BLOCK_SIZE) - if not data: - break - output.write(data) - output.flush() # Commit block to Keep - self.bytes_written += len(data) - # Is it time to update the collection? - if (time.time() - start_time) > self.collection_flush_time: - self.collection.save() - start_time = time.time() - # File write finished - output.close() - self.collection.save() # One last save... - - def write_directory_tree(self, path, stream_name='.', max_manifest_depth=-1): - if os.path.isdir(path): - for item in os.listdir(path): - print "Checking path: '%s' - stream_name: '%s'" % (path, stream_name) - if os.path.isdir(os.path.join(path, item)): - self.write_directory_tree(os.path.join(path, item), - os.path.join(stream_name, item)) - else: - self.write_file(os.path.join(path, item), - os.path.join(stream_name, item)) - - def manifest(self): - print "BLOCK SIZE: %d" % arvados.config.KEEP_BLOCK_SIZE - print "MANIFEST Locator:\n%s\nMANIFEST TEXT:\n%s" % (self.collection.manifest_locator(), self.collection.manifest_text()) - return True - - def report_progress(self): - if self.reporter is not None: - self.reporter(self.bytes_written, self.bytes_expected) + self._cache_file.close() + self._cache_file = new_cache + def collection_name(self): + return self._my_collection().api_response()['name'] if self._my_collection().api_response() else None -class ArvPutCollectionWriter(arvados.ResumableCollectionWriter): - STATE_PROPS = (arvados.ResumableCollectionWriter.STATE_PROPS + - ['bytes_written', '_seen_inputs']) + def manifest_locator(self): + return self._my_collection().manifest_locator() - def __init__(self, cache=None, reporter=None, bytes_expected=None, **kwargs): - self.bytes_written = 0 - self._seen_inputs = [] - self.cache = cache - self.reporter = reporter - self.bytes_expected = bytes_expected - super(ArvPutCollectionWriter, self).__init__(**kwargs) + def portable_data_hash(self): + return self._my_collection().portable_data_hash() - @classmethod - def from_cache(cls, cache, reporter=None, bytes_expected=None, - num_retries=0, replication=0): - try: - state = cache.load() - state['_data_buffer'] = [base64.decodestring(state['_data_buffer'])] - writer = cls.from_state(state, cache, reporter, bytes_expected, - num_retries=num_retries, - replication=replication) - except (TypeError, ValueError, - arvados.errors.StaleWriterStateError) as error: - return cls(cache, reporter, bytes_expected, - num_retries=num_retries, - replication=replication) - else: - return writer - - def cache_state(self): - if self.cache is None: - return - state = self.dump_state() - # Transform attributes for serialization. - for attr, value in state.items(): - if attr == '_data_buffer': - state[attr] = base64.encodestring(''.join(value)) - elif hasattr(value, 'popleft'): - state[attr] = list(value) - self.cache.save(state) + def manifest_text(self, stream_name=".", strip=False, normalize=False): + return self._my_collection().manifest_text(stream_name, strip, normalize) - def report_progress(self): - if self.reporter is not None: - self.reporter(self.bytes_written, self.bytes_expected) + def _datablocks_on_item(self, item): + """ + Return a list of datablock locators, recursively navigating + through subcollections + """ + if isinstance(item, arvados.arvfile.ArvadosFile): + if item.size() == 0: + # Empty file locator + return ["d41d8cd98f00b204e9800998ecf8427e+0"] + else: + locators = [] + for segment in item.segments(): + loc = segment.locator + locators.append(loc) + return locators + elif isinstance(item, arvados.collection.Collection): + l = [self._datablocks_on_item(x) for x in item.values()] + # Fast list flattener method taken from: + # http://stackoverflow.com/questions/952914/making-a-flat-list-out-of-list-of-lists-in-python + return [loc for sublist in l for loc in sublist] + else: + return None - def flush_data(self): - start_buffer_len = self._data_buffer_len - start_block_count = self.bytes_written / arvados.config.KEEP_BLOCK_SIZE - super(ArvPutCollectionWriter, self).flush_data() - if self._data_buffer_len < start_buffer_len: # We actually PUT data. - self.bytes_written += (start_buffer_len - self._data_buffer_len) - self.report_progress() - if (self.bytes_written / arvados.config.KEEP_BLOCK_SIZE) > start_block_count: - self.cache_state() - - def _record_new_input(self, input_type, source_name, dest_name): - # The key needs to be a list because that's what we'll get back - # from JSON deserialization. - key = [input_type, source_name, dest_name] - if key in self._seen_inputs: - return False - self._seen_inputs.append(key) - return True - - def write_file(self, source, filename=None): - if self._record_new_input('file', source, filename): - super(ArvPutCollectionWriter, self).write_file(source, filename) - - def write_directory_tree(self, - path, stream_name='.', max_manifest_depth=-1): - if self._record_new_input('directory', path, stream_name): - super(ArvPutCollectionWriter, self).write_directory_tree( - path, stream_name, max_manifest_depth) + def data_locators(self): + with self._collection_lock: + # Make sure all datablocks are flushed before getting the locators + self._my_collection().manifest_text() + datablocks = self._datablocks_on_item(self._my_collection()) + return datablocks def expected_bytes_for(pathlist): @@ -589,6 +815,7 @@ def desired_project_uuid(api_client, project_uuid, num_retries): def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr): global api_client + logger = logging.getLogger('arvados.arv_put') args = parse_arguments(arguments) status = 0 if api_client is None: @@ -597,7 +824,10 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr): # Determine the name to use if args.name: if args.stream or args.raw: - print >>stderr, "Cannot use --name with --stream or --raw" + logger.error("Cannot use --name with --stream or --raw") + sys.exit(1) + elif args.update_collection: + logger.error("Cannot use --name with --update-collection") sys.exit(1) collection_name = args.name else: @@ -607,7 +837,7 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr): socket.gethostname()) if args.project_uuid and (args.stream or args.raw): - print >>stderr, "Cannot use --project-uuid with --stream or --raw" + logger.error("Cannot use --project-uuid with --stream or --raw") sys.exit(1) # Determine the parent project @@ -615,123 +845,98 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr): project_uuid = desired_project_uuid(api_client, args.project_uuid, args.retries) except (apiclient_errors.Error, ValueError) as error: - print >>stderr, error + logger.error(error) sys.exit(1) - # write_copies diverges from args.replication here. - # args.replication is how many copies we will instruct Arvados to - # maintain (by passing it in collections().create()) after all - # data is written -- and if None was given, we'll use None there. - # Meanwhile, write_copies is how many copies of each data block we - # write to Keep, which has to be a number. - # - # If we simply changed args.replication from None to a default - # here, we'd end up erroneously passing the default replication - # level (instead of None) to collections().create(). - write_copies = (args.replication or - api_client._rootDesc.get('defaultCollectionReplication', 2)) - if args.progress: reporter = progress_writer(human_progress) elif args.batch_progress: reporter = progress_writer(machine_progress) else: reporter = None - bytes_expected = expected_bytes_for(args.paths) - resume_cache = None - if args.resume: - try: - resume_cache = ResumeCache(ResumeCache.make_path(args)) - resume_cache.check_cache(api_client=api_client, num_retries=args.retries) - except (IOError, OSError, ValueError): - pass # Couldn't open cache directory/file. Continue without it. - except ResumeCacheConflict: - print >>stderr, "\n".join([ - "arv-put: Another process is already uploading this data.", - " Use --no-resume if this is really what you want."]) - sys.exit(1) + bytes_expected = expected_bytes_for(args.paths) - if resume_cache is None: - writer = ArvPutCollectionWriter( - resume_cache, reporter, bytes_expected, - num_retries=args.retries, - replication=write_copies) - else: - writer = ArvPutCollectionWriter.from_cache( - resume_cache, reporter, bytes_expected, - num_retries=args.retries, - replication=write_copies) + try: + writer = ArvPutUploadJob(paths = args.paths, + resume = args.resume, + use_cache = args.use_cache, + filename = args.filename, + reporter = reporter, + bytes_expected = bytes_expected, + num_retries = args.retries, + replication_desired = args.replication, + put_threads = args.threads, + name = collection_name, + owner_uuid = project_uuid, + ensure_unique_name = True, + update_collection = args.update_collection, + logger=logger, + dry_run=args.dry_run) + except ResumeCacheConflict: + logger.error("\n".join([ + "arv-put: Another process is already uploading this data.", + " Use --no-cache if this is really what you want."])) + sys.exit(1) + except CollectionUpdateError as error: + logger.error("\n".join([ + "arv-put: %s" % str(error)])) + sys.exit(1) + except ArvPutUploadIsPending: + # Dry run check successful, return proper exit code. + sys.exit(2) + except ArvPutUploadNotPending: + # No files pending for upload + sys.exit(0) # Install our signal handler for each code in CAUGHT_SIGNALS, and save # the originals. orig_signal_handlers = {sigcode: signal.signal(sigcode, exit_signal_handler) for sigcode in CAUGHT_SIGNALS} - if writer.bytes_written > 0: # We're resuming a previous upload. - print >>stderr, "\n".join([ - "arv-put: Resuming previous upload from last checkpoint.", - " Use the --no-resume option to start over."]) - - writer.report_progress() - writer.do_queued_work() # Do work resumed from cache. - for path in args.paths: # Copy file data to Keep. - if path == '-': - writer.start_new_stream() - writer.start_new_file(args.filename) - r = sys.stdin.read(64*1024) - while r: - # Need to bypass _queued_file check in ResumableCollectionWriter.write() to get - # CollectionWriter.write(). - super(arvados.collection.ResumableCollectionWriter, writer).write(r) - r = sys.stdin.read(64*1024) - elif os.path.isdir(path): - writer.write_directory_tree( - path, max_manifest_depth=args.max_manifest_depth) - else: - writer.start_new_stream() - writer.write_file(path, args.filename or os.path.basename(path)) - writer.finish_current_stream() + if not args.dry_run and not args.update_collection and args.resume and writer.bytes_written > 0: + logger.warning("\n".join([ + "arv-put: Resuming previous upload from last checkpoint.", + " Use the --no-resume option to start over."])) + + if not args.dry_run: + writer.report_progress() + output = None + try: + writer.start(save_collection=not(args.stream or args.raw)) + except arvados.errors.ApiError as error: + logger.error("\n".join([ + "arv-put: %s" % str(error)])) + sys.exit(1) + except ArvPutUploadIsPending: + # Dry run check successful, return proper exit code. + sys.exit(2) + except ArvPutUploadNotPending: + # No files pending for upload + sys.exit(0) if args.progress: # Print newline to split stderr from stdout for humans. - print >>stderr + logger.info("\n") - output = None if args.stream: - output = writer.manifest_text() if args.normalize: - output = arvados.collection.CollectionReader(output).manifest_text(normalize=True) + output = writer.manifest_text(normalize=True) + else: + output = writer.manifest_text() elif args.raw: output = ','.join(writer.data_locators()) else: try: - manifest_text = writer.manifest_text() - if args.normalize: - manifest_text = arvados.collection.CollectionReader(manifest_text).manifest_text(normalize=True) - replication_attr = 'replication_desired' - if api_client._schema.schemas['Collection']['properties'].get(replication_attr, None) is None: - # API called it 'redundancy' before #3410. - replication_attr = 'redundancy' - # Register the resulting collection in Arvados. - collection = api_client.collections().create( - body={ - 'owner_uuid': project_uuid, - 'name': collection_name, - 'manifest_text': manifest_text, - replication_attr: args.replication, - }, - ensure_unique_name=True - ).execute(num_retries=args.retries) - - print >>stderr, "Collection saved as '%s'" % collection['name'] - - if args.portable_data_hash and 'portable_data_hash' in collection and collection['portable_data_hash']: - output = collection['portable_data_hash'] + if args.update_collection: + logger.info("Collection updated: '{}'".format(writer.collection_name())) else: - output = collection['uuid'] - + logger.info("Collection saved as '{}'".format(writer.collection_name())) + if args.portable_data_hash: + output = writer.portable_data_hash() + else: + output = writer.manifest_locator() except apiclient_errors.Error as error: - print >>stderr, ( + logger.error( "arv-put: Error creating Collection on project: {}.".format( error)) status = 1 @@ -750,10 +955,9 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr): if status != 0: sys.exit(status) - if resume_cache is not None: - resume_cache.destroy() - + # Success! return output + if __name__ == '__main__': main()