import timer
import types
import UserDict
+import util
import zlib
import arvados
self._writable_services = self._keep_services
self.using_proxy = True
self._static_services_list = True
+ self.thread_count = None
else:
# It's important to avoid instantiating an API client
# unless we actually need one, for testing's sake.
self._writable_services = None
self.using_proxy = None
self._static_services_list = False
+ self.thread_count = None
def current_timeout(self, attempt_number):
"""Return the appropriate timeout to use for this client.
self.using_proxy = any(ks.get('service_type') == 'proxy'
for ks in self._keep_services)
+ # Use a thread_count of 1 if the service is not a disk
+ for ks in accessible:
+ if ('disk' != ks.get('service_type')) and (True != ks.get('read_only')):
+ self.thread_count = 1
def _service_weight(self, data_hash, service_uuid):
"""Compute the weight of a Keep service endpoint for a data
sorted_roots = []
- # Use the services indicated by the given +K@... remote
- # service hints, if any are present and can be resolved to a
- # URI.
+ # Use the services indicated by the given hints that are
+ # not size or authorization hints.
+ # If it is a K@ hint of size 7, it is a keepproxy
+ # Otherwise, expect the hint to be of len 29 and a uuid
+ # of a remote service that can be resolved to a URI.
for hint in locator.hints:
- if hint.startswith('K@'):
- if len(hint) == 7:
+ if not hint.startswith('A') and not hint[0].isdigit():
+ if len(hint) == 7 and hint.startswith('K@'):
sorted_roots.append(
"https://keep.{}.arvadosapi.com/".format(hint[2:]))
- elif len(hint) == 29:
+ elif len(hint) == 29 and re.match(util.uuid_pattern, hint[2:]):
svc = self._gateway_services.get(hint[2:])
if svc:
sorted_roots.append(svc['_service_root'])
locator = KeepLocator(loc_s)
headers = {}
- if self.using_proxy:
- # Tell the proxy how many copies we want it to store
- headers['X-Keep-Desired-Replication'] = str(copies)
+ # Tell the proxy how many copies we want it to store
+ headers['X-Keep-Desired-Replication'] = str(copies)
roots_map = {}
- thread_limiter = KeepClient.ThreadLimiter(copies)
+ thread_limiter = KeepClient.ThreadLimiter(1 if 1 == self.thread_count else copies)
loop = retry.RetryLoop(num_retries, self._check_loop_result,
backoff_start=2)
for tries_left in loop: