Skip to content

Commit 5820018

Browse files
piotrsulkowski-elasticpiotrsulkowski-elastic
committed
don't return available_processors by default
1 parent e112f80 commit 5820018

File tree

4 files changed

+26
-85
lines changed

4 files changed

+26
-85
lines changed

‎distribution/docker/src/yamlRestTest/resources/rest-api-spec/test/11_nodes.yml‎

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,5 @@
11
---
2-
"Test cat nodes output for all fields with available_processors":
3-
- requires:
4-
capabilities:
5-
- method: GET
6-
path: /_cat/nodes
7-
capabilities: [ available_processors_availability ]
8-
test_runner_features: [ capabilities ]
9-
reason: available_processors capability required to run test
10-
11-
- do:
12-
cat.nodes: {}
13-
14-
- match:
15-
$body: |
16-
/ #ip heap.percent ram.percent cpu load_1m load_5m load_15m available_processors node.role master name
17-
^ ((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?\s+ ((-)?\d*(\.\d+)?)? \s+ (\d+)? \s+ (-|[cdfhilmrstvw]{1,11}) \s+ [-*x] \s+ .* \n)+ $/
18-
19-
- do:
20-
cat.nodes:
21-
v: true
22-
23-
- match:
24-
$body: |
25-
/^ ip \s+ heap\.percent \s+ ram\.percent \s+ cpu \s+ load_1m \s+ load_5m \s+ load_15m \s+ available_processors \s+ node\.role \s+ master \s+ name \n
26-
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (\d+)? \s+ (-|[cdfhilmrstvw]{1,11}) \s+ [-*x] \s+ .* \n)+ $/
27-
28-
---
29-
"Test cat nodes output for all fields before available_processors was added":
30-
- requires:
31-
test_runner_features: [ capabilities ]
32-
33-
- skip:
34-
capabilities:
35-
- method: GET
36-
path: /_cat/nodes
37-
capabilities: [ available_processors_availability ]
38-
reason: available_processors capability must be missing to run this test
2+
"Test cat nodes output":
393

404
- do:
415
cat.nodes: {}
@@ -51,11 +15,9 @@
5115

5216
- match:
5317
$body: |
54-
/^ 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
55-
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdfhilmrstvw]{1,11}) \s+ [-*x] \s+ .* \n)+ $/
18+
/^ 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
19+
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdfhilmrstvw]{1,11}) \s+ [-*x] \s+ .* \n)+ $/
5620
57-
---
58-
"Test cat nodes output for selected fields":
5921
- do:
6022
cat.nodes:
6123
h: heap.current,heap.percent,heap.max

‎rest-api-spec/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
100100
task.skipTest("logsdb/10_settings/end time not allowed in logs mode", "we don't validate for index_mode=tsdb when setting start_date/end_date anymore")
101101
task.skipTest("tsdb/10_settings/set start_time and end_time without timeseries mode", "we don't validate for index_mode=tsdb when setting start_date/end_date anymore")
102102
task.skipTest("tsdb/10_settings/set start_time, end_time and routing_path via put settings api without time_series mode", "we don't validate for index_mode=tsdb when setting start_date/end_date anymore")
103-
task.skipTest("cat.nodes/10_basic/Test cat nodes output", "a new field 'available_processors' was added")
104103
// Expected deprecation warning to compat yaml tests:
105104
task.addAllowedWarningRegex("Use of the \\[max_size\\] rollover condition has been deprecated in favour of the \\[max_primary_shard_size\\] condition and will be removed in a later version")
106105
})

‎rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cat.nodes/10_basic.yml‎

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,5 @@
11
---
2-
"Test cat nodes output for all fields with available_processors":
3-
- requires:
4-
capabilities:
5-
- method: GET
6-
path: /_cat/nodes
7-
capabilities: [ available_processors_availability ]
8-
test_runner_features: [ capabilities ]
9-
reason: available_processors capability required to run test
10-
11-
- do:
12-
cat.nodes: {}
13-
14-
- match:
15-
$body: |
16-
/ #ip heap.percent ram.percent cpu load_1m load_5m load_15m available_processors node.role master name
17-
^ ((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)?\s+ ((-)?\d*(\.\d+)?)? \s+ (\d+)? \s+ (-|[cdfhilmrstvwIS]{1,11}) \s+ [-*x] \s+ .* \n)+ $/
18-
19-
- do:
20-
cat.nodes:
21-
v: true
22-
23-
- match:
24-
$body: |
25-
/^ ip \s+ heap\.percent \s+ ram\.percent \s+ cpu \s+ load_1m \s+ load_5m \s+ load_15m \s+ available_processors \s+ node\.role \s+ master \s+ name \n
26-
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (\d+)? \s+ (-|[cdfhilmrstvwIS]{1,11}) \s+ [-*x] \s+ .* \n)+ $/
27-
28-
---
29-
"Test cat nodes output for all fields before available_processors was added":
30-
31-
- requires:
32-
test_runner_features: [ capabilities ]
33-
34-
- skip:
35-
capabilities:
36-
- method: GET
37-
path: /_cat/nodes
38-
capabilities: [ available_processors_availability ]
39-
reason: available_processors capability must be missing to run this test
40-
2+
"Test cat nodes output":
413
- do:
424
cat.nodes: {}
435

@@ -48,15 +10,13 @@
4810
4911
- do:
5012
cat.nodes:
51-
v: true
13+
v: true
5214

5315
- match:
5416
$body: |
5517
/^ 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
5618
((\d{1,3}\.){3}\d{1,3} \s+ \d+ \s+ \d* \s+ (-)?\d* \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ ((-)?\d*(\.\d+)?)? \s+ (-|[cdfhilmrstvwIS]{1,11}) \s+ [-*x] \s+ .* \n)+ $/
5719
58-
---
59-
"Test cat nodes output for selected fields":
6020
- do:
6121
cat.nodes:
6222
h: heap.current,heap.percent,heap.max
@@ -97,6 +57,26 @@
9757
$body: |
9858
/^ http \n ((\d{1,3}\.){3}\d{1,3}:\d{1,5}\n)+ $/
9959
60+
---
61+
"Test cat nodes output for all fields with available_processors":
62+
- requires:
63+
capabilities:
64+
- method: GET
65+
path: /_cat/nodes
66+
capabilities: [ available_processors_availability ]
67+
test_runner_features: [ capabilities ]
68+
reason: available_processors capability required to run test
69+
70+
- do:
71+
cat.nodes:
72+
h: ap,available_processors
73+
v: true
74+
75+
- match:
76+
$body: |
77+
/^ ap \s+ available_processors \n
78+
( \s+ \d+ \s+ \d+ \n )+ $/
79+
10080
---
10181
"Additional disk information":
10282
- do:

‎server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ protected Table getTableWithHeader(final RestRequest request) {
172172
table.addCell("load_1m", "alias:l;text-align:right;desc:1m load avg");
173173
table.addCell("load_5m", "alias:l;text-align:right;desc:5m load avg");
174174
table.addCell("load_15m", "alias:l;text-align:right;desc:15m load avg");
175-
table.addCell("available_processors", "alias:ap;text-align:right;desc:available processors");
175+
table.addCell("available_processors", "default:false;alias:ap;text-align:right;desc:available processors");
176176
table.addCell("uptime", "default:false;alias:u;text-align:right;desc:node uptime");
177177
table.addCell(
178178
"node.role",

0 commit comments

Comments
 (0)