@@ -79,7 +79,7 @@ def flush(self, index=None, params=None):
79
79
)
80
80
81
81
@query_params (
82
- "master_timeout" , "timeout " , "wait_for_active_shards" , "include_type_name"
82
+ "master_timeout" , "request_timeout " , "wait_for_active_shards" , "include_type_name"
83
83
)
84
84
def create (self , index , body = None , params = None ):
85
85
"""
@@ -89,7 +89,7 @@ def create(self, index, body=None, params=None):
89
89
:arg index: The name of the index
90
90
:arg body: The configuration for the index (`settings` and `mappings`)
91
91
:arg master_timeout: Specify timeout for connection to master
92
- :arg timeout : Explicit operation timeout
92
+ :arg request_timeout : Explicit operation timeout
93
93
:arg wait_for_active_shards: Set the number of active shards to wait for
94
94
before the operation returns.
95
95
:arg include_type_name: Specify whether requests and responses should include a
@@ -141,7 +141,7 @@ def get(self, index, feature=None, params=None):
141
141
"expand_wildcards" ,
142
142
"ignore_unavailable" ,
143
143
"master_timeout" ,
144
- "timeout " ,
144
+ "request_timeout " ,
145
145
)
146
146
def open (self , index , params = None ):
147
147
"""
@@ -158,7 +158,7 @@ def open(self, index, params=None):
158
158
:arg ignore_unavailable: Whether specified concrete indices should be
159
159
ignored when unavailable (missing or closed)
160
160
:arg master_timeout: Specify timeout for connection to master
161
- :arg timeout : Explicit operation timeout
161
+ :arg request_timeout : Explicit operation timeout
162
162
"""
163
163
if index in SKIP_IN_PATH :
164
164
raise ValueError ("Empty value passed for a required argument 'index'." )
@@ -171,7 +171,7 @@ def open(self, index, params=None):
171
171
"expand_wildcards" ,
172
172
"ignore_unavailable" ,
173
173
"master_timeout" ,
174
- "timeout " ,
174
+ "request_timeout " ,
175
175
)
176
176
def close (self , index , params = None ):
177
177
"""
@@ -189,7 +189,7 @@ def close(self, index, params=None):
189
189
:arg ignore_unavailable: Whether specified concrete indices should be
190
190
ignored when unavailable (missing or closed)
191
191
:arg master_timeout: Specify timeout for connection to master
192
- :arg timeout : Explicit operation timeout
192
+ :arg request_timeout : Explicit operation timeout
193
193
"""
194
194
if index in SKIP_IN_PATH :
195
195
raise ValueError ("Empty value passed for a required argument 'index'." )
@@ -202,7 +202,7 @@ def close(self, index, params=None):
202
202
"expand_wildcards" ,
203
203
"ignore_unavailable" ,
204
204
"master_timeout" ,
205
- "timeout " ,
205
+ "request_timeout " ,
206
206
)
207
207
def delete (self , index , params = None ):
208
208
"""
@@ -218,7 +218,7 @@ def delete(self, index, params=None):
218
218
choices are: 'open', 'closed', 'none', 'all'
219
219
:arg ignore_unavailable: Ignore unavailable indexes (default: false)
220
220
:arg master_timeout: Specify timeout for connection to master
221
- :arg timeout : Explicit operation timeout
221
+ :arg request_timeout : Explicit operation timeout
222
222
"""
223
223
if index in SKIP_IN_PATH :
224
224
raise ValueError ("Empty value passed for a required argument 'index'." )
@@ -288,7 +288,7 @@ def exists_type(self, index, doc_type, params=None):
288
288
"expand_wildcards" ,
289
289
"ignore_unavailable" ,
290
290
"master_timeout" ,
291
- "timeout " ,
291
+ "request_timeout " ,
292
292
"include_type_name" ,
293
293
)
294
294
def put_mapping (self , body , doc_type = None , index = None , params = None ):
@@ -310,7 +310,7 @@ def put_mapping(self, body, doc_type=None, index=None, params=None):
310
310
:arg ignore_unavailable: Whether specified concrete indices should be
311
311
ignored when unavailable (missing or closed)
312
312
:arg master_timeout: Specify timeout for connection to master
313
- :arg timeout : Explicit operation timeout
313
+ :arg request_timeout : Explicit operation timeout
314
314
:arg include_type_name: Specify whether requests and responses should include a
315
315
type name (default: depends on Elasticsearch version).
316
316
"""
@@ -391,7 +391,7 @@ def get_field_mapping(self, fields, index=None, doc_type=None, params=None):
391
391
params = params ,
392
392
)
393
393
394
- @query_params ("master_timeout" , "timeout " )
394
+ @query_params ("master_timeout" , "request_timeout " )
395
395
def put_alias (self , index , name , body = None , params = None ):
396
396
"""
397
397
Create an alias for a specific index/indices.
@@ -403,7 +403,7 @@ def put_alias(self, index, name, body=None, params=None):
403
403
:arg name: The name of the alias to be created or updated
404
404
:arg body: The settings for the alias, such as `routing` or `filter`
405
405
:arg master_timeout: Specify timeout for connection to master
406
- :arg timeout : Explicit timeout for the operation
406
+ :arg request_timeout : Explicit timeout for the operation
407
407
"""
408
408
for param in (index , name ):
409
409
if param in SKIP_IN_PATH :
@@ -458,23 +458,23 @@ def get_alias(self, index=None, name=None, params=None):
458
458
"GET" , _make_path (index , "_alias" , name ), params = params
459
459
)
460
460
461
- @query_params ("master_timeout" , "timeout " )
461
+ @query_params ("master_timeout" , "request_timeout " )
462
462
def update_aliases (self , body , params = None ):
463
463
"""
464
464
Update specified aliases.
465
465
`<http://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html>`_
466
466
467
467
:arg body: The definition of `actions` to perform
468
468
:arg master_timeout: Specify timeout for connection to master
469
- :arg timeout : Request timeout
469
+ :arg request_timeout : Request timeout
470
470
"""
471
471
if body in SKIP_IN_PATH :
472
472
raise ValueError ("Empty value passed for a required argument 'body'." )
473
473
return self .transport .perform_request (
474
474
"POST" , "/_aliases" , params = params , body = body
475
475
)
476
476
477
- @query_params ("master_timeout" , "timeout " )
477
+ @query_params ("master_timeout" , "request_timeout " )
478
478
def delete_alias (self , index , name , params = None ):
479
479
"""
480
480
Delete specific alias.
@@ -486,7 +486,7 @@ def delete_alias(self, index, name, params=None):
486
486
wildcards); use `_all` to delete all aliases for the specified
487
487
indices.
488
488
:arg master_timeout: Specify timeout for connection to master
489
- :arg timeout : Explicit timeout for the operation
489
+ :arg request_timeout : Explicit timeout for the operation
490
490
"""
491
491
for param in (index , name ):
492
492
if param in SKIP_IN_PATH :
@@ -500,7 +500,7 @@ def delete_alias(self, index, name, params=None):
500
500
"flat_settings" ,
501
501
"master_timeout" ,
502
502
"order" ,
503
- "timeout " ,
503
+ "request_timeout " ,
504
504
"include_type_name" ,
505
505
)
506
506
def put_template (self , name , body , params = None ):
@@ -517,7 +517,7 @@ def put_template(self, name, body, params=None):
517
517
:arg master_timeout: Specify timeout for connection to master
518
518
:arg order: The order for this template when merging multiple matching
519
519
ones (higher numbers are merged later, overriding the lower numbers)
520
- :arg timeout : Explicit operation timeout
520
+ :arg request_timeout : Explicit operation timeout
521
521
:arg include_type_name: Specify whether requests and responses should include a
522
522
type name (default: depends on Elasticsearch version).
523
523
"""
@@ -566,15 +566,15 @@ def get_template(self, name=None, params=None):
566
566
"GET" , _make_path ("_template" , name ), params = params
567
567
)
568
568
569
- @query_params ("master_timeout" , "timeout " )
569
+ @query_params ("master_timeout" , "request_timeout " )
570
570
def delete_template (self , name , params = None ):
571
571
"""
572
572
Delete an index template by its name.
573
573
`<http://www.elastic.co/guide/en/elasticsearch/reference/current/indices-templates.html>`_
574
574
575
575
:arg name: The name of the template
576
576
:arg master_timeout: Specify timeout for connection to master
577
- :arg timeout : Explicit operation timeout
577
+ :arg request_timeout : Explicit operation timeout
578
578
"""
579
579
if name in SKIP_IN_PATH :
580
580
raise ValueError ("Empty value passed for a required argument 'name'." )
@@ -984,7 +984,7 @@ def forcemerge(self, index=None, params=None):
984
984
"POST" , _make_path (index , "_forcemerge" ), params = params
985
985
)
986
986
987
- @query_params ("master_timeout" , "timeout " , "wait_for_active_shards" )
987
+ @query_params ("master_timeout" , "request_timeout " , "wait_for_active_shards" )
988
988
def shrink (self , index , target , body = None , params = None ):
989
989
"""
990
990
The shrink index API allows you to shrink an existing index into a new
@@ -1003,7 +1003,7 @@ def shrink(self, index, target, body=None, params=None):
1003
1003
:arg body: The configuration for the target index (`settings` and
1004
1004
`aliases`)
1005
1005
:arg master_timeout: Specify timeout for connection to master
1006
- :arg timeout : Explicit operation timeout
1006
+ :arg request_timeout : Explicit operation timeout
1007
1007
:arg wait_for_active_shards: Set the number of active shards to wait for
1008
1008
on the shrunken index before the operation returns.
1009
1009
"""
@@ -1017,7 +1017,7 @@ def shrink(self, index, target, body=None, params=None):
1017
1017
@query_params (
1018
1018
"dry_run" ,
1019
1019
"master_timeout" ,
1020
- "timeout " ,
1020
+ "request_timeout " ,
1021
1021
"wait_for_active_shards" ,
1022
1022
"include_type_name" ,
1023
1023
)
@@ -1039,7 +1039,7 @@ def rollover(self, alias, new_index=None, body=None, params=None):
1039
1039
but not actually performed even if a condition matches. The default
1040
1040
is false
1041
1041
:arg master_timeout: Specify timeout for connection to master
1042
- :arg timeout : Explicit operation timeout
1042
+ :arg request_timeout : Explicit operation timeout
1043
1043
:arg wait_for_active_shards: Set the number of active shards to wait for
1044
1044
on the newly created rollover index before the operation returns.
1045
1045
:arg include_type_name: Specify whether requests and responses should include a
0 commit comments