Cluster stats should not render empty http/transport types #23735
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tlrx
added
:Core/Infra/REST API
tlrx
force-pushed
the
do-not-render-empty-field-names-in-transport-type-stats
branch
2 times, most recently
from
37514c6
to
ee83445
Compare
tlrx
force-pushed
the
do-not-render-empty-field-names-in-transport-type-stats
branch
6 times, most recently
from
9bca46c
to
67cac31
Compare
This commit changes the ClusterStatsNodes.NetworkTypes so that is does
not print out empty field names when no Transport or HTTP type is defined:
```
{
"network_types": {
...
"http_types": {
"": 2
}
}
}
```
is now rendered as:
```
{
"network_types": {
...
"http_types": {
}
}
}
```
tlrx
force-pushed
the
do-not-render-empty-field-names-in-transport-type-stats
branch
from
67cac31
to
442ed82
Compare
spinscale
reviewed
Mar 31, 2017
| @@ -560,12 +571,16 @@ private NetworkTypes(final List<NodeInfo> nodeInfos) { | |||
| public XContentBuilder toXContent(final XContentBuilder builder, final Params params) throws IOException { | |||
| builder.startObject("transport_types"); | |||
| for (final Map.Entry<String, AtomicInteger> entry : transportTypes.entrySet()) { | |||
| builder.field(entry.getKey(), entry.getValue().get()); | |||
| if (Strings.hasText(entry.getKey())) { | |||
There was a problem hiding this comment.
should the check be done here, or should such an element never get added to the map at the first place?
spinscale
approved these changes
Mar 31, 2017
spinscale
approved these changes
Mar 31, 2017
|
Thanks @spinscale ! |
tlrx
added a commit
that referenced
this pull request
Mar 31, 2017
This commit changes the ClusterStatsNodes.NetworkTypes so that is does
not print out empty field names when no Transport or HTTP type is defined:
```
{
"network_types": {
...
"http_types": {
"": 2
}
}
}
```
is now rendered as:
```
{
"network_types": {
...
"http_types": {
}
}
}
```
tlrx
added a commit
that referenced
this pull request
Mar 31, 2017
This commit changes the ClusterStatsNodes.NetworkTypes so that is does
not print out empty field names when no Transport or HTTP type is defined:
```
{
"network_types": {
...
"http_types": {
"": 2
}
}
}
```
is now rendered as:
```
{
"network_types": {
...
"http_types": {
}
}
}
```
tlrx
added a commit
that referenced
this pull request
Mar 31, 2017
This commit changes the ClusterStatsNodes.NetworkTypes so that is does
not print out empty field names when no Transport or HTTP type is defined:
```
{
"network_types": {
...
"http_types": {
"": 2
}
}
}
```
is now rendered as:
```
{
"network_types": {
...
"http_types": {
}
}
}
```
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Apr 1, 2017
* master: Fix language in some docs CONSOLEify lang-analyzer docs Stricter parsing of remote node attribute Fix cross-cluster remote node gateway attributes FieldCapabilitiesRequest should implements Replaceable since it accepts index patterns Cleanup: Remove unused FieldMappers class (elastic#23851) Fix FieldCapabilities compilation in Eclipse (elastic#23855) Add extra debugging to reindex cancel tests Cluster stats should not render empty http/transport types (elastic#23735)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit changes
ClusterStatsNodes.NetworkTypesso that is doesnot print out empty field names when no Transport or HTTP type is defined:
is now rendered as:
This should almost never happen because
transport-netty4is shipped by default, but we can have integration tests that use mocked transport plugins without registering HTTP transport types.