projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20937: fix deadlock with duplicated blocks
[arvados.git]
/
sdk
/
python
/
arvados
/
__init__.py
diff --git
a/sdk/python/arvados/__init__.py
b/sdk/python/arvados/__init__.py
index fa7e253a3d8436a3abaaa30e910628992043c4ad..21ca72c4bdb15fb6aafa1e76001777d9769e5fc9 100644
(file)
--- a/
sdk/python/arvados/__init__.py
+++ b/
sdk/python/arvados/__init__.py
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
from __future__ import print_function
from __future__ import absolute_import
from future import standard_library
from __future__ import print_function
from __future__ import absolute_import
from future import standard_library
@@
-9,14
+13,12
@@
import hashlib
import http.client
import httplib2
import json
import http.client
import httplib2
import json
-import logging
+import logging
as stdliblog
import os
import pprint
import re
import string
import os
import pprint
import re
import string
-import subprocess
import sys
import sys
-import threading
import time
import types
import zlib
import time
import types
import zlib
@@
-31,21
+33,23
@@
from .collection import CollectionReader, CollectionWriter, ResumableCollectionW
from arvados.keep import *
from arvados.stream import *
from .arvfile import StreamFileReader
from arvados.keep import *
from arvados.stream import *
from .arvfile import StreamFileReader
+from .logging import log_format, log_date_format, log_handler
from .retry import RetryLoop
import arvados.errors as errors
import arvados.util as util
from .retry import RetryLoop
import arvados.errors as errors
import arvados.util as util
+# Override logging module pulled in via `from ... import *`
+# so users can `import arvados.logging`.
+logging = sys.modules['arvados.logging']
+
# Set up Arvados logging based on the user's configuration.
# All Arvados code should log under the arvados hierarchy.
# Set up Arvados logging based on the user's configuration.
# All Arvados code should log under the arvados hierarchy.
-log_handler = logging.StreamHandler()
-log_handler.setFormatter(logging.Formatter(
- '%(asctime)s %(name)s[%(process)d] %(levelname)s: %(message)s',
- '%Y-%m-%d %H:%M:%S'))
-logger = logging.getLogger('arvados')
+logger = stdliblog.getLogger('arvados')
logger.addHandler(log_handler)
logger.addHandler(log_handler)
-logger.setLevel(
loggin
g.DEBUG if config.get('ARVADOS_DEBUG')
- else
loggin
g.WARNING)
+logger.setLevel(
stdliblo
g.DEBUG if config.get('ARVADOS_DEBUG')
+ else
stdliblo
g.WARNING)
+@util._deprecated('3.0', 'arvados-cwl-runner or the containers API')
def task_set_output(self, s, num_retries=5):
for tries_left in RetryLoop(num_retries=num_retries, backoff_start=0):
try:
def task_set_output(self, s, num_retries=5):
for tries_left in RetryLoop(num_retries=num_retries, backoff_start=0):
try:
@@
-63,6
+67,7
@@
def task_set_output(self, s, num_retries=5):
raise
_current_task = None
raise
_current_task = None
+@util._deprecated('3.0', 'arvados-cwl-runner or the containers API')
def current_task(num_retries=5):
global _current_task
if _current_task:
def current_task(num_retries=5):
global _current_task
if _current_task:
@@
-83,6
+88,7
@@
def current_task(num_retries=5):
raise
_current_job = None
raise
_current_job = None
+@util._deprecated('3.0', 'arvados-cwl-runner or the containers API')
def current_job(num_retries=5):
global _current_job
if _current_job:
def current_job(num_retries=5):
global _current_job
if _current_job:
@@
-101,21
+107,26
@@
def current_job(num_retries=5):
else:
raise
else:
raise
+@util._deprecated('3.0', 'arvados-cwl-runner or the containers API')
def getjobparam(*args):
return current_job()['script_parameters'].get(*args)
def getjobparam(*args):
return current_job()['script_parameters'].get(*args)
+@util._deprecated('3.0', 'arvados-cwl-runner or the containers API')
def get_job_param_mount(*args):
return os.path.join(os.environ['TASK_KEEPMOUNT'], current_job()['script_parameters'].get(*args))
def get_job_param_mount(*args):
return os.path.join(os.environ['TASK_KEEPMOUNT'], current_job()['script_parameters'].get(*args))
+@util._deprecated('3.0', 'arvados-cwl-runner or the containers API')
def get_task_param_mount(*args):
return os.path.join(os.environ['TASK_KEEPMOUNT'], current_task()['parameters'].get(*args))
class JobTask(object):
def get_task_param_mount(*args):
return os.path.join(os.environ['TASK_KEEPMOUNT'], current_task()['parameters'].get(*args))
class JobTask(object):
+ @util._deprecated('3.0', 'arvados-cwl-runner or the containers API')
def __init__(self, parameters=dict(), runtime_constraints=dict()):
print("init jobtask %s %s" % (parameters, runtime_constraints))
class job_setup(object):
@staticmethod
def __init__(self, parameters=dict(), runtime_constraints=dict()):
print("init jobtask %s %s" % (parameters, runtime_constraints))
class job_setup(object):
@staticmethod
+ @util._deprecated('3.0', 'arvados-cwl-runner or the containers API')
def one_task_per_input_file(if_sequence=0, and_end_task=True, input_as_path=False, api_client=None):
if if_sequence != current_task()['sequence']:
return
def one_task_per_input_file(if_sequence=0, and_end_task=True, input_as_path=False, api_client=None):
if if_sequence != current_task()['sequence']:
return
@@
-148,6
+159,7
@@
class job_setup(object):
exit(0)
@staticmethod
exit(0)
@staticmethod
+ @util._deprecated('3.0', 'arvados-cwl-runner or the containers API')
def one_task_per_input_stream(if_sequence=0, and_end_task=True):
if if_sequence != current_task()['sequence']:
return
def one_task_per_input_stream(if_sequence=0, and_end_task=True):
if if_sequence != current_task()['sequence']:
return