X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/88c26c6b2dd8752ec1ff8196f4af11369ea6adbb..eb58fd945645f5a670c761f7046b10885941167e:/sdk/cwl/arvados_cwl/fsaccess.py diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py index 534a675525..5981268128 100644 --- a/sdk/cwl/arvados_cwl/fsaccess.py +++ b/sdk/cwl/arvados_cwl/fsaccess.py @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + import fnmatch import os import errno @@ -5,6 +9,7 @@ import urlparse import re import logging import threading +from collections import OrderedDict import ruamel.yaml as yaml @@ -17,24 +22,53 @@ import arvados.collection import arvados.arvfile import arvados.errors +from googleapiclient.errors import HttpError + from schema_salad.ref_resolver import DefaultFetcher logger = logging.getLogger('arvados.cwl-runner') class CollectionCache(object): - def __init__(self, api_client, keep_client, num_retries): + def __init__(self, api_client, keep_client, num_retries, + cap=256*1024*1024, + min_entries=2): self.api_client = api_client self.keep_client = keep_client - self.collections = {} + self.num_retries = num_retries + self.collections = OrderedDict() self.lock = threading.Lock() + self.total = 0 + self.cap = cap + self.min_entries = min_entries + + def cap_cache(self): + if self.total > self.cap: + # ordered list iterates from oldest to newest + for pdh, v in self.collections.items(): + if self.total < self.cap or len(self.collections) < self.min_entries: + break + # cut it loose + logger.debug("Evicting collection reader %s from cache", pdh) + del self.collections[pdh] + self.total -= v[1] def get(self, pdh): with self.lock: if pdh not in self.collections: logger.debug("Creating collection reader for %s", pdh) - self.collections[pdh] = arvados.collection.CollectionReader(pdh, api_client=self.api_client, - keep_client=self.keep_client) - return self.collections[pdh] + cr = arvados.collection.CollectionReader(pdh, api_client=self.api_client, + keep_client=self.keep_client, + num_retries=self.num_retries) + sz = len(cr.manifest_text()) * 128 + self.collections[pdh] = (cr, sz) + self.total += sz + self.cap_cache() + else: + cr, sz = self.collections[pdh] + # bump it to the back + del self.collections[pdh] + self.collections[pdh] = (cr, sz) + return cr class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess): @@ -49,7 +83,7 @@ class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess): p = sp[0] if p.startswith("keep:") and arvados.util.keep_locator_pattern.match(p[5:]): pdh = p[5:] - return (self.collection_cache.get(pdh), sp[1] if len(sp) == 2 else None) + return (self.collection_cache.get(pdh), urlparse.unquote(sp[1]) if len(sp) == 2 else None) else: return (None, path) @@ -77,21 +111,27 @@ class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess): def glob(self, pattern): collection, rest = self.get_collection(pattern) - if collection and not rest: + if collection is not None and not rest: return [pattern] patternsegments = rest.split("/") - return self._match(collection, patternsegments, "keep:" + collection.manifest_locator()) + return sorted(self._match(collection, patternsegments, "keep:" + collection.manifest_locator())) def open(self, fn, mode): collection, rest = self.get_collection(fn) - if collection: + if collection is not None: return collection.open(rest, mode) else: return super(CollectionFsAccess, self).open(self._abs(fn), mode) def exists(self, fn): - collection, rest = self.get_collection(fn) - if collection: + try: + collection, rest = self.get_collection(fn) + except HttpError as err: + if err.resp.status == 404: + return False + else: + raise + if collection is not None: if rest: return collection.exists(rest) else: @@ -99,9 +139,20 @@ class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess): else: return super(CollectionFsAccess, self).exists(fn) + def size(self, fn): # type: (unicode) -> bool + collection, rest = self.get_collection(fn) + if collection is not None: + if rest: + arvfile = collection.find(rest) + if isinstance(arvfile, arvados.arvfile.ArvadosFile): + return arvfile.size() + raise IOError(errno.EINVAL, "Not a path to a file %s" % (fn)) + else: + return super(CollectionFsAccess, self).size(fn) + def isfile(self, fn): # type: (unicode) -> bool collection, rest = self.get_collection(fn) - if collection: + if collection is not None: if rest: return isinstance(collection.find(rest), arvados.arvfile.ArvadosFile) else: @@ -111,7 +162,7 @@ class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess): def isdir(self, fn): # type: (unicode) -> bool collection, rest = self.get_collection(fn) - if collection: + if collection is not None: if rest: return isinstance(collection.find(rest), arvados.collection.RichCollectionBase) else: @@ -121,7 +172,7 @@ class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess): def listdir(self, fn): # type: (unicode) -> List[unicode] collection, rest = self.get_collection(fn) - if collection: + if collection is not None: if rest: dir = collection.find(rest) else: @@ -143,7 +194,7 @@ class CollectionFsAccess(cwltool.stdfsaccess.StdFsAccess): if path.startswith("$(task.tmpdir)") or path.startswith("$(task.outdir)"): return path collection, rest = self.get_collection(path) - if collection: + if collection is not None: return path else: return os.path.realpath(path) @@ -214,10 +265,19 @@ class CollectionFetcher(DefaultFetcher): return super(CollectionFetcher, self).urljoin(base_url, url) + schemes = [u"file", u"http", u"https", u"mailto", u"keep", u"arvwf"] + + def supported_schemes(self): # type: () -> List[Text] + return self.schemes + + workflow_uuid_pattern = re.compile(r'[a-z0-9]{5}-7fd4e-[a-z0-9]{15}') pipeline_template_uuid_pattern = re.compile(r'[a-z0-9]{5}-p5p6p-[a-z0-9]{15}') def collectionResolver(api_client, document_loader, uri, num_retries=4): + if uri.startswith("keep:") or uri.startswith("arvwf:"): + return uri + if workflow_uuid_pattern.match(uri): return "arvwf:%s#main" % (uri)