projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21578: Merge branch 'main' into 21578-mount-debug
[arvados.git]
/
sdk
/
python
/
arvados
/
commands
/
get.py
diff --git
a/sdk/python/arvados/commands/get.py
b/sdk/python/arvados/commands/get.py
index bb421def618cddd36ba7d2241e2b1e81b58581ac..b37a8477acb1606e72516b1401b4a0fc5c718b60 100755
(executable)
--- a/
sdk/python/arvados/commands/get.py
+++ b/
sdk/python/arvados/commands/get.py
@@
-6,6
+6,7
@@
import argparse
import hashlib
import os
import argparse
import hashlib
import os
+import pathlib
import re
import string
import sys
import re
import string
import sys
@@
-155,7
+156,7
@@
def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
request_id = arvados.util.new_request_id()
logger.info('X-Request-Id: '+request_id)
request_id = arvados.util.new_request_id()
logger.info('X-Request-Id: '+request_id)
- api_client = arvados.api('v1', request_id=request_id)
+ api_client = arvados.api('v1', request_id=request_id
, num_retries=args.retries
)
r = re.search(r'^(.*?)(/.*)?$', args.locator)
col_loc = r.group(1)
r = re.search(r'^(.*?)(/.*)?$', args.locator)
col_loc = r.group(1)
@@
-197,8
+198,7
@@
def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
try:
reader = arvados.CollectionReader(
col_loc, api_client=api_client, num_retries=args.retries,
try:
reader = arvados.CollectionReader(
col_loc, api_client=api_client, num_retries=args.retries,
- keep_client=arvados.keep.KeepClient(block_cache=arvados.keep.KeepBlockCache((args.threads+1)*64 * 1024 * 1024)),
- get_threads=args.threads)
+ keep_client=arvados.keep.KeepClient(block_cache=arvados.keep.KeepBlockCache((args.threads+1)*64 * 1024 * 1024), num_prefetch_threads=args.threads))
except Exception as error:
logger.error("failed to read collection: {}".format(error))
return 1
except Exception as error:
logger.error("failed to read collection: {}".format(error))
return 1
@@
-262,7
+262,7
@@
def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr):
logger.error('Local file %s already exists.' % (outfilename,))
return 1
if args.r:
logger.error('Local file %s already exists.' % (outfilename,))
return 1
if args.r:
-
arvados.util.mkdir_dash_p(os.path.dirname(outfilename)
)
+
pathlib.Path(outfilename).parent.mkdir(parents=True, exist_ok=True
)
try:
outfile = open(outfilename, 'wb')
except Exception as error:
try:
outfile = open(outfilename, 'wb')
except Exception as error: