X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b8de9b3e62e82b806576b237be5f317bf378169f..1a3de5eab1062485e6985d43bc7c3e036254efb6:/sdk/cwl/arvados_cwl/fsaccess.py diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py index a99b2a7414..0b577b06a2 100644 --- a/sdk/cwl/arvados_cwl/fsaccess.py +++ b/sdk/cwl/arvados_cwl/fsaccess.py @@ -1,9 +1,15 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + import fnmatch import os import errno import urlparse import re import logging +import threading +from collections import OrderedDict import ruamel.yaml as yaml @@ -20,23 +26,62 @@ 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, + cap=256*1024*1024, + min_entries=2): + self.api_client = api_client + self.keep_client = keep_client + 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) + 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): """Implement the cwltool FsAccess interface for Arvados Collections.""" - def __init__(self, basedir, api_client=None, keep_client=None): + def __init__(self, basedir, collection_cache=None): super(CollectionFsAccess, self).__init__(basedir) - self.api_client = api_client - self.keep_client = keep_client - self.collections = {} + self.collection_cache = collection_cache def get_collection(self, path): - p = path.split("/") - if p[0].startswith("keep:") and arvados.util.keep_locator_pattern.match(p[0][5:]): - pdh = p[0][5:] - if pdh not in self.collections: - self.collections[pdh] = arvados.collection.CollectionReader(pdh, api_client=self.api_client, - keep_client=self.keep_client) - return (self.collections[pdh], "/".join(p[1:])) + sp = path.split("/", 1) + 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) else: return (None, path) @@ -64,28 +109,31 @@ 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: - return collection.exists(rest) + if collection is not None: + if rest: + return collection.exists(rest) + else: + return True else: return super(CollectionFsAccess, self).exists(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: @@ -95,7 +143,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: @@ -105,7 +153,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: @@ -127,16 +175,16 @@ 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) class CollectionFetcher(DefaultFetcher): - def __init__(self, cache, session, api_client=None, keep_client=None, num_retries=4): + def __init__(self, cache, session, api_client=None, fs_access=None, num_retries=4): super(CollectionFetcher, self).__init__(cache, session) self.api_client = api_client - self.fsaccess = CollectionFsAccess("", api_client=api_client, keep_client=keep_client) + self.fsaccess = fs_access self.num_retries = num_retries def fetch_text(self, url): @@ -151,6 +199,8 @@ class CollectionFetcher(DefaultFetcher): def check_exists(self, url): try: + if url.startswith("http://arvados.org/cwl"): + return True if url.startswith("keep:"): return self.fsaccess.exists(url) if url.startswith("arvwf:"): @@ -200,6 +250,9 @@ 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)