Stats to record how often the ClusterState diff mechanism is used successfully #26973
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.discovery.zen; | ||
|
|
||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
| import org.elasticsearch.common.io.stream.StreamOutput; | ||
| import org.elasticsearch.common.io.stream.Writeable; | ||
| import org.elasticsearch.common.xcontent.ToXContentFragment; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Class encapsulating stats about the PublishClusterStateAction | ||
| */ | ||
| public class PublishClusterStateStats implements Writeable, ToXContentFragment { | ||
|
There was a problem hiding this comment. I think you want ToXContentObject here. |
||
|
|
||
| private final long fullClusterStateSentCount; | ||
| private final long clusterStateDiffSentCount; | ||
| private final long incompatibleClusterStateDiffVersionCount; | ||
|
|
||
| public PublishClusterStateStats(long fullClusterStateSentCount, | ||
|
There was a problem hiding this comment. can you java doc the parameters? There was a problem hiding this comment. Params or getters? Or both? |
||
| long clusterStateDiffSentCount, | ||
| long incompatibleClusterStateDiffVersionCount) { | ||
| this.fullClusterStateSentCount = fullClusterStateSentCount; | ||
| this.clusterStateDiffSentCount = clusterStateDiffSentCount; | ||
| this.incompatibleClusterStateDiffVersionCount = incompatibleClusterStateDiffVersionCount; | ||
| } | ||
|
|
||
| public PublishClusterStateStats(StreamInput streamInput) throws IOException { | ||
|
There was a problem hiding this comment. We normally name these |
||
| fullClusterStateSentCount = streamInput.readVLong(); | ||
| clusterStateDiffSentCount = streamInput.readVLong(); | ||
| incompatibleClusterStateDiffVersionCount = streamInput.readVLong(); | ||
| } | ||
|
|
||
| @Override | ||
| public void writeTo(StreamOutput out) throws IOException { | ||
| out.writeVLong(fullClusterStateSentCount); | ||
| out.writeVLong(clusterStateDiffSentCount); | ||
| out.writeVLong(incompatibleClusterStateDiffVersionCount); | ||
| } | ||
|
|
||
| static final class Fields { | ||
|
There was a problem hiding this comment. We've been moving away from these inner fields classes, we don't need them to encapsulate some strings. |
||
| static final String PUBLISH_CLUSTER_STATE = "publish_cluster_state"; | ||
| static final String FULL_SENT = "full_cluster_states_sent"; | ||
| static final String DIFFS_SENT = "cluster_state_diffs_sent"; | ||
| static final String INCOMPATIBLE_DIFFS = "incompatible_cluster_state_diffs_sent"; | ||
| } | ||
|
|
||
| @Override | ||
| public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { | ||
| builder.startObject(Fields.PUBLISH_CLUSTER_STATE); | ||
| builder.field(Fields.FULL_SENT, fullClusterStateSentCount); | ||
| builder.field(Fields.DIFFS_SENT, clusterStateDiffSentCount); | ||
| builder.field(Fields.INCOMPATIBLE_DIFFS, incompatibleClusterStateDiffVersionCount); | ||
| builder.endObject(); | ||
| return builder; | ||
|
There was a problem hiding this comment. Here you can do something like this: diff --git a/core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java b/core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java
index 356b9a29dc..36794e880f 100644
--- a/core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java
+++ b/core/src/main/java/org/elasticsearch/discovery/zen/PublishClusterStateStats.java
@@ -65,9 +65,11 @@ public class PublishClusterStateStats implements Writeable, ToXContentObject {
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject("published_cluster_states");
- builder.field("full_states", fullClusterStateReceivedCount);
- builder.field("incompatible_diffs", incompatibleClusterStateDiffReceivedCount);
- builder.field("compatible_diffs", compatibleClusterStateDiffReceivedCount);
+ {
+ builder.field("full_states", fullClusterStateReceivedCount);
+ builder.field("incompatible_diffs", incompatibleClusterStateDiffReceivedCount);
+ builder.field("compatible_diffs", compatibleClusterStateDiffReceivedCount);
+ }
builder.endObject();
return builder;
}which makes the JSON-structure clearer in the code. |
||
| } | ||
|
|
||
| public long getFullClusterStateSentCount() { | ||
| return fullClusterStateSentCount; | ||
| } | ||
|
|
||
| public long getClusterStateDiffSentCount() { | ||
| return clusterStateDiffSentCount; | ||
| } | ||
|
|
||
| public long getIncompatibleClusterStateDiffVersionCount() { | ||
| return incompatibleClusterStateDiffVersionCount; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "PublishClusterStateStats(full=" + fullClusterStateSentCount | ||
| + ", diffs=" + clusterStateDiffSentCount | ||
| + ", incompatible=" + incompatibleClusterStateDiffVersionCount | ||
| + ")"; | ||
| } | ||
| } | ||
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not think we need the
@Nullableannotation on a private field (I question its usefulness in general).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should I remove the one above too?