Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Search latency - Coordinator] Changing version check to 2.11 #10280

Merged
merged 2 commits into from
Sep 30, 2023
Merged

[Search latency - Coordinator] Changing version check to 2.11 #10280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b29a6fd
[Search latency - Coordinator] Changing version check to 2.11
sgup432 Sep 29, 2023
bb0df81
[Port main] update version check as per v2.11.0
sgup432 Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
---
"Metric - indexing doc_status":
- skip:
version: " - 2.99.99"
reason: "To be introduced in future release :: TODO: change if/when we backport to 2.x"
version: " - 2.10.99"
reason: "Doc Status Stats were introduced in v2.11.0"
- do:
nodes.info: {}
- set:
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/opensearch/index/search/stats/SearchStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ private Stats(StreamInput in) throws IOException {
pitCurrent = in.readVLong();
}

if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
if (in.getVersion().onOrAfter(Version.V_2_11_0)) {
this.requestStatsLongHolder = new RequestStatsLongHolder();
requestStatsLongHolder.requestStatsHolder = in.readMap(StreamInput::readString, PhaseStatsLongHolder::new);
}
Expand Down Expand Up @@ -437,7 +437,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeVLong(pitCurrent);
}

if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
if (out.getVersion().onOrAfter(Version.V_2_11_0)) {
if (requestStatsLongHolder == null) {
requestStatsLongHolder = new RequestStatsLongHolder();
}
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/opensearch/index/shard/IndexingStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public Stats(StreamInput in) throws IOException {
isThrottled = in.readBoolean();
throttleTimeInMillis = in.readLong();

if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
if (in.getVersion().onOrAfter(Version.V_2_11_0)) {
docStatusStats = in.readOptionalWriteable(DocStatusStats::new);
} else {
docStatusStats = null;
Expand Down Expand Up @@ -308,7 +308,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeBoolean(isThrottled);
out.writeLong(throttleTimeInMillis);

if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
if (out.getVersion().onOrAfter(Version.V_2_11_0)) {
out.writeOptionalWriteable(docStatusStats);
}
}
Expand Down
Loading