Fix task submission speed regression

- Resolves #183
This commit is contained in:
Fred Park 2018-04-10 10:21:45 -07:00
Родитель fc6c5969b5
Коммит 727292f902
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 3C4D545F457737EB
1 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -3681,8 +3681,8 @@ def _construct_task(
:param bool uses_task_dependencies: uses task dependencies :param bool uses_task_dependencies: uses task dependencies
:param batchmodels.OntaskFailure on_task_failure: on task failure :param batchmodels.OntaskFailure on_task_failure: on task failure
:param dict _task: task spec :param dict _task: task spec
:rtype: str :rtype: tuple
:return: task id added to task map :return: (list of committed task ids for job, task id added to task map)
""" """
_task_id = settings.task_id(_task) _task_id = settings.task_id(_task)
if util.is_none_or_empty(_task_id): if util.is_none_or_empty(_task_id):
@ -4014,7 +4014,7 @@ def _construct_task(
'duplicate task id detected: {} for job {}'.format( 'duplicate task id detected: {} for job {}'.format(
task.id, job_id)) task.id, job_id))
task_map[task.id] = batchtask task_map[task.id] = batchtask
return task.id return existing_tasklist, task.id
def add_jobs( def add_jobs(
@ -4470,7 +4470,7 @@ def add_jobs(
# add all tasks under job # add all tasks under job
task_map = {} task_map = {}
for _task in settings.job_tasks(config, jobspec): for _task in settings.job_tasks(config, jobspec):
lasttaskid = _construct_task( existing_tasklist, lasttaskid = _construct_task(
batch_client, blob_client, keyvault_client, config, bxfile, batch_client, blob_client, keyvault_client, config, bxfile,
bs, native, is_windows, tempdisk, allow_run_on_missing, bs, native, is_windows, tempdisk, allow_run_on_missing,
docker_missing_images, singularity_missing_images, cloud_pool, docker_missing_images, singularity_missing_images, cloud_pool,
@ -4479,7 +4479,7 @@ def add_jobs(
uses_task_dependencies, on_task_failure, _task) uses_task_dependencies, on_task_failure, _task)
if has_merge_task: if has_merge_task:
_task = settings.job_merge_task(jobspec) _task = settings.job_merge_task(jobspec)
merge_task_id = _construct_task( existing_tasklist, merge_task_id = _construct_task(
batch_client, blob_client, keyvault_client, config, bxfile, batch_client, blob_client, keyvault_client, config, bxfile,
bs, native, is_windows, tempdisk, allow_run_on_missing, bs, native, is_windows, tempdisk, allow_run_on_missing,
docker_missing_images, singularity_missing_images, cloud_pool, docker_missing_images, singularity_missing_images, cloud_pool,