Replace 'master' with 'cluster_manager' in 'GET Cat Nodes' API (#2441)
* Replace 'master' with 'cluster_manager' in the table header of [GET Cat Nodes](https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-nodes/) API, to promote inclusive language. * Add `cm` as the alias for the table header `cluster_manager` * Add `master` as the alias for the table header `cluster_manager`, for keeping compatibility when using `GET _cat/nodes?v&h=master` to show the specific column only. * Add YAML rest test Signed-off-by: Tianli Feng <ftianli@amazon.com>
This commit is contained in:
Tianli Feng
GitHub
parent
ee048851f5
commit
641350b0b6
|
|
@ -1,13 +1,8 @@
|
|||
---
|
||||
"Test cat nodes output":
|
||||
|
||||
- do:
|
||||
cat.nodes: {}
|
||||
|
||||
- match:
|
||||
$body: |
|
||||
/ #ip heap.percent ram.percent cpu load_1m load_5m load_15m node.role master name
|
||||
^ ((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?\s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdhilmrstvw]{1,11}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
|
||||
"Test cat nodes output - before 2.0.0":
|
||||
- skip:
|
||||
version: "2.0.0 - "
|
||||
reason: "master is replaced by cluster_manager in 2.0.0"
|
||||
|
||||
- do:
|
||||
cat.nodes:
|
||||
|
|
@ -18,6 +13,29 @@
|
|||
/^ ip \s+ heap\.percent \s+ ram\.percent \s+ cpu \s+ load_1m \s+ load_5m \s+ load_15m \s+ node\.role \s+ master \s+ name \n
|
||||
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdhilmrstvw]{1,11}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
|
||||
|
||||
---
|
||||
"Test cat nodes output":
|
||||
- skip:
|
||||
version: " - 1.4.99"
|
||||
reason: "cluster_manager is introduced in 2.0.0"
|
||||
|
||||
- do:
|
||||
cat.nodes: {}
|
||||
|
||||
- match:
|
||||
$body: |
|
||||
/ #ip heap.percent ram.percent cpu load_1m load_5m load_15m node.role cluster_manager name
|
||||
^ ((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?\s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdhilmrstvw]{1,11}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
|
||||
|
||||
- do:
|
||||
cat.nodes:
|
||||
v: true
|
||||
|
||||
- match:
|
||||
$body: |
|
||||
/^ ip \s+ heap\.percent \s+ ram\.percent \s+ cpu \s+ load_1m \s+ load_5m \s+ load_15m \s+ node\.role \s+ cluster_manager \s+ name \n
|
||||
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdhilmrstvw]{1,11}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
|
||||
|
||||
- do:
|
||||
cat.nodes:
|
||||
h: heap.current,heap.percent,heap.max
|
||||
|
|
|
|||
|
|
@ -1,12 +1,38 @@
|
|||
---
|
||||
"Test cat nodes output - before 2.0.0":
|
||||
- skip:
|
||||
version: "2.0.0 - "
|
||||
reason: "master is replaced by cluster_manager in 2.0.0"
|
||||
features: node_selector
|
||||
|
||||
- do:
|
||||
cat.nodes:
|
||||
v: true
|
||||
node_selector:
|
||||
# Only send request to nodes in <2.0 versions, especially during ':qa:mixed-cluster:v1.x.x#mixedClusterTest'.
|
||||
# Because YAML REST test takes the minimum OpenSearch version in the cluster to apply the filter in 'skip' section,
|
||||
# see OpenSearchClientYamlSuiteTestCase#initAndResetContext() for detail.
|
||||
# During 'mixedClusterTest', the cluster can be mixed with nodes in 1.x and 2.x versions,
|
||||
# so node_selector is required, and only filtering version in 'skip' is not enough.
|
||||
version: "1.0.0 - 1.4.99"
|
||||
|
||||
- match:
|
||||
$body: |
|
||||
/^ ip \s+ heap\.percent \s+ ram\.percent \s+ cpu \s+ load_1m \s+ load_5m \s+ load_15m \s+ node\.role \s+ master \s+ name \n
|
||||
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdhilmrstvw]{1,11}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
|
||||
|
||||
---
|
||||
"Test cat nodes output":
|
||||
- skip:
|
||||
version: " - 1.4.99"
|
||||
reason: "cluster_manager is introduced in 2.0.0"
|
||||
|
||||
- do:
|
||||
cat.nodes: {}
|
||||
|
||||
- match:
|
||||
$body: |
|
||||
/ #ip heap.percent ram.percent cpu load_1m load_5m load_15m node.role master name
|
||||
/ #ip heap.percent ram.percent cpu load_1m load_5m load_15m node.role cluster_manager name
|
||||
^ ((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?\s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdhilmrstvw]{1,11}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
|
||||
|
||||
- do:
|
||||
|
|
@ -15,7 +41,7 @@
|
|||
|
||||
- match:
|
||||
$body: |
|
||||
/^ ip \s+ heap\.percent \s+ ram\.percent \s+ cpu \s+ load_1m \s+ load_5m \s+ load_15m \s+ node\.role \s+ master \s+ name \n
|
||||
/^ ip \s+ heap\.percent \s+ ram\.percent \s+ cpu \s+ load_1m \s+ load_5m \s+ load_15m \s+ node\.role \s+ cluster_manager \s+ name \n
|
||||
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdhilmrstvw]{1,11}) \s+ [-*x] \s+ (\S+\s?)+ \n)+ $/
|
||||
|
||||
- do:
|
||||
|
|
|
|||
|
|
@ -196,7 +196,8 @@ public class RestNodesAction extends AbstractCatAction {
|
|||
"node.role",
|
||||
"alias:r,role,nodeRole;desc:m:master eligible node, d:data node, i:ingest node, -:coordinating node only"
|
||||
);
|
||||
table.addCell("master", "alias:m;desc:*:current master");
|
||||
// TODO: Remove the header alias 'master', after removing MASTER_ROLE. It's added for compatibility when using parameter 'h=master'.
|
||||
table.addCell("cluster_manager", "alias:cm,m,master;desc:*:current cluster manager");
|
||||
table.addCell("name", "alias:n;desc:node name");
|
||||
|
||||
table.addCell("completion.size", "alias:cs,completionSize;default:false;text-align:right;desc:size of completion");
|
||||
|
|
|
|||
Loading…
Reference in New Issue