Skip to content

Commit 36f4637

Browse files
Tianli Fenggithub-actions[bot]
Tianli Feng
authored and
github-actions[bot]
committed
Add request parameter 'cluster_manager_timeout' as the alternative for 'master_timeout', and deprecate 'master_timeout' - in CAT APIs (#2557)
Apply the change of CAT Nodes API in PR #2435 to other applicable CAT APIs. - Deprecate the request parameter `master_timeout` that used in many CAT APIs. - Add alternative new request parameter `cluster_manager_timeout`. - Add unit tests. Signed-off-by: Tianli Feng <ftianli@amazon.com> (cherry picked from commit 78465b4)
1 parent e3891c7 commit 36f4637

25 files changed

Lines changed: 347 additions & 76 deletions

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.allocation.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,15 @@
5555
},
5656
"master_timeout":{
5757
"type":"time",
58-
"description":"Explicit operation timeout for connection to master node"
58+
"description":"Explicit operation timeout for connection to master node",
59+
"deprecated":{
60+
"version":"2.0.0",
61+
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
62+
}
63+
},
64+
"cluster_manager_timeout":{
65+
"type":"time",
66+
"description":"Explicit operation timeout for connection to cluster-manager node"
5967
},
6068
"h":{
6169
"type":"list",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.cluster_manager.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,15 @@
3636
},
3737
"master_timeout":{
3838
"type":"time",
39-
"description":"Explicit operation timeout for connection to master node"
39+
"description":"Explicit operation timeout for connection to master node",
40+
"deprecated":{
41+
"version":"2.0.0",
42+
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
43+
}
44+
},
45+
"cluster_manager_timeout":{
46+
"type":"time",
47+
"description":"Explicit operation timeout for connection to cluster-manager node"
4048
},
4149
"h":{
4250
"type":"list",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.indices.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,15 @@
5555
},
5656
"master_timeout":{
5757
"type":"time",
58-
"description":"Explicit operation timeout for connection to master node"
58+
"description":"Explicit operation timeout for connection to master node",
59+
"deprecated":{
60+
"version":"2.0.0",
61+
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
62+
}
63+
},
64+
"cluster_manager_timeout":{
65+
"type":"time",
66+
"description":"Explicit operation timeout for connection to cluster-manager node"
5967
},
6068
"h":{
6169
"type":"list",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodeattrs.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,15 @@
2626
},
2727
"master_timeout":{
2828
"type":"time",
29-
"description":"Explicit operation timeout for connection to master node"
29+
"description":"Explicit operation timeout for connection to master node",
30+
"deprecated":{
31+
"version":"2.0.0",
32+
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
33+
}
34+
},
35+
"cluster_manager_timeout":{
36+
"type":"time",
37+
"description":"Explicit operation timeout for connection to cluster-manager node"
3038
},
3139
"h":{
3240
"type":"list",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.pending_tasks.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,15 @@
2626
},
2727
"master_timeout":{
2828
"type":"time",
29-
"description":"Explicit operation timeout for connection to master node"
29+
"description":"Explicit operation timeout for connection to master node",
30+
"deprecated":{
31+
"version":"2.0.0",
32+
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
33+
}
34+
},
35+
"cluster_manager_timeout":{
36+
"type":"time",
37+
"description":"Explicit operation timeout for connection to cluster-manager node"
3038
},
3139
"h":{
3240
"type":"list",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.plugins.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,15 @@
2626
},
2727
"master_timeout":{
2828
"type":"time",
29-
"description":"Explicit operation timeout for connection to master node"
29+
"description":"Explicit operation timeout for connection to master node",
30+
"deprecated":{
31+
"version":"2.0.0",
32+
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
33+
}
34+
},
35+
"cluster_manager_timeout":{
36+
"type":"time",
37+
"description":"Explicit operation timeout for connection to cluster-manager node"
3038
},
3139
"h":{
3240
"type":"list",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.repositories.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,15 @@
2727
},
2828
"master_timeout":{
2929
"type":"time",
30-
"description":"Explicit operation timeout for connection to master node"
30+
"description":"Explicit operation timeout for connection to master node",
31+
"deprecated":{
32+
"version":"2.0.0",
33+
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
34+
}
35+
},
36+
"cluster_manager_timeout":{
37+
"type":"time",
38+
"description":"Explicit operation timeout for connection to cluster-manager node"
3139
},
3240
"h":{
3341
"type":"list",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.segments.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,18 @@
4949
"pb"
5050
]
5151
},
52+
"master_timeout":{
53+
"type":"time",
54+
"description":"Explicit operation timeout for connection to master node",
55+
"deprecated":{
56+
"version":"2.0.0",
57+
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
58+
}
59+
},
60+
"cluster_manager_timeout":{
61+
"type":"time",
62+
"description":"Explicit operation timeout for connection to cluster-manager node"
63+
},
5264
"h":{
5365
"type":"list",
5466
"description":"Comma-separated list of column names to display"

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.shards.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,15 @@
5555
},
5656
"master_timeout":{
5757
"type":"time",
58-
"description":"Explicit operation timeout for connection to master node"
58+
"description":"Explicit operation timeout for connection to master node",
59+
"deprecated":{
60+
"version":"2.0.0",
61+
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
62+
}
63+
},
64+
"cluster_manager_timeout":{
65+
"type":"time",
66+
"description":"Explicit operation timeout for connection to cluster-manager node"
5967
},
6068
"h":{
6169
"type":"list",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.snapshots.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,15 @@
3939
},
4040
"master_timeout":{
4141
"type":"time",
42-
"description":"Explicit operation timeout for connection to master node"
42+
"description":"Explicit operation timeout for connection to master node",
43+
"deprecated":{
44+
"version":"2.0.0",
45+
"description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
46+
}
47+
},
48+
"cluster_manager_timeout":{
49+
"type":"time",
50+
"description":"Explicit operation timeout for connection to cluster-manager node"
4351
},
4452
"h":{
4553
"type":"list",

0 commit comments

Comments
 (0)