From 6f6c864bc805bc92a74ce2669d1d6d0cc6a128a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Mon, 25 Nov 2013 11:57:21 +0100 Subject: [PATCH] Bulk supports timeout parameter in new ES --- elasticsearch/client/__init__.py | 3 ++- test_elasticsearch/rest-api-spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/elasticsearch/client/__init__.py b/elasticsearch/client/__init__.py index db86e586..fda428e7 100644 --- a/elasticsearch/client/__init__.py +++ b/elasticsearch/client/__init__.py @@ -502,7 +502,7 @@ class Elasticsearch(object): params=params, body=body) return data - @query_params('consistency', 'refresh', 'replication') + @query_params('consistency', 'refresh', 'replication', 'timeout') def bulk(self, body, index=None, doc_type=None, params=None): """ Perform many index/delete operations in a single API call. @@ -519,6 +519,7 @@ class Elasticsearch(object): :arg consistency: Explicit write consistency setting for the operation :arg refresh: Refresh the index after performing the operation :arg replication: Explicitly set the replication type (default: sync) + :arg timeout: Explicit operation timeout """ _, data = self.transport.perform_request('POST', _make_path(index, doc_type, '_bulk'), params=params, body=self._bulk_body(body)) diff --git a/test_elasticsearch/rest-api-spec b/test_elasticsearch/rest-api-spec index 21bacbbb..394e3e45 160000 --- a/test_elasticsearch/rest-api-spec +++ b/test_elasticsearch/rest-api-spec @@ -1 +1 @@ -Subproject commit 21bacbbbf3d1ee8743310087c783cc7700f51a93 +Subproject commit 394e3e45e835467c6626368275eeec8fc89952ca