From b049b684bb8cea55929920052dfac0344734af6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=22RooTer=22=20Urba=C5=84ski?= Date: Fri, 12 Oct 2018 17:39:22 +0200 Subject: [PATCH] add timeout param to Tasks API (closes #852) (#853) --- elasticsearch/client/tasks.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/elasticsearch/client/tasks.py b/elasticsearch/client/tasks.py index a0cda685..8056bfdd 100644 --- a/elasticsearch/client/tasks.py +++ b/elasticsearch/client/tasks.py @@ -2,7 +2,7 @@ from .utils import NamespacedClient, query_params, _make_path, SKIP_IN_PATH class TasksClient(NamespacedClient): @query_params('actions', 'detailed', 'group_by', 'nodes', - 'parent_task_id', 'wait_for_completion') + 'parent_task_id', 'wait_for_completion', 'timeout') def list(self, params=None): """ ``_ @@ -20,6 +20,7 @@ class TasksClient(NamespacedClient): (node_id:task_number). Set to -1 to return all. :arg wait_for_completion: Wait for the matching tasks to complete (default: false) + :arg timeout: Maximum waiting time for `wait_for_completion` """ return self.transport.perform_request('GET', '/_tasks', params=params) @@ -43,7 +44,7 @@ class TasksClient(NamespacedClient): return self.transport.perform_request('POST', _make_path('_tasks', task_id, '_cancel'), params=params) - @query_params('wait_for_completion') + @query_params('wait_for_completion', 'timeout') def get(self, task_id=None, params=None): """ Retrieve information for a particular task. @@ -52,6 +53,7 @@ class TasksClient(NamespacedClient): :arg task_id: Return the task with specified id (node_id:task_number) :arg wait_for_completion: Wait for the matching tasks to complete (default: false) + :arg timeout: Maximum waiting time for `wait_for_completion` """ return self.transport.perform_request('GET', _make_path('_tasks', task_id), params=params)