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

Update version checks for shard search idle metric after backport to 2.x #12972

Merged
merged 5 commits into from
Mar 29, 2024
Merged

Update version checks for shard search idle metric after backport to 2.x #12972

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c400887
change version check
ruai0511 Mar 28, 2024
f346ee5
change changelog
ruai0511 Mar 28, 2024
475bead
Merge branch 'main' into version-switch-search-idle
ruai0511 Mar 28, 2024
4c07556
Update version check on REST test
msfroh Mar 29, 2024
7109a53
Remove changelog entry
msfroh Mar 29, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Add a counter to node stat api to track shard going from idle to non-idle ([#12768](https://github.com/opensearch-project/OpenSearch/pull/12768))
- Allow setting KEYSTORE_PASSWORD through env variable ([#12865](https://github.com/opensearch-project/OpenSearch/pull/12865))
- [Concurrent Segment Search] Perform buildAggregation concurrently and support Composite Aggregations ([#12697](https://github.com/opensearch-project/OpenSearch/pull/12697))
- Fix version checks for search idle metric ([#12972](https://github.com/opensearch-project/OpenSearch/pull/12972))
msfroh marked this conversation as resolved.
Show resolved Hide resolved
- [Concurrent Segment Search] Disable concurrent segment search for system indices and throttled requests ([#12954](https://github.com/opensearch-project/OpenSearch/pull/12954))

### Dependencies
Expand Down
10 changes: 5 additions & 5 deletions rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
"Help":
- skip:
version: " - 2.99.99"
version: " - 2.13.99"
reason: search idle reactivate count total is only added in 3.0.0
features: node_selector
- do:
cat.shards:
help: true
node_selector:
version: "3.0.0 - "
version: "2.14.0 - "

- match:
$body: |
Expand Down Expand Up @@ -93,16 +93,16 @@
docs.deleted .+ \n
$/
---
"Help from 2.12.0 to 2.99.99":
"Help from 2.12.0 to 2.13.99":
- skip:
version: " - 2.11.99 , 3.0.0 - "
version: " - 2.11.99 , 2.14.0 - "
reason: deleted docs and concurrent search are added in 2.12.0
features: node_selector
- do:
cat.shards:
help: true
node_selector:
version: "2.12.0 - 2.99.99"
version: "2.12.0 - 2.13.99"

- match:
$body: |
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 @@ -261,7 +261,7 @@ private Stats(StreamInput in) throws IOException {
queryConcurrency = in.readVLong();
}

if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
if (in.getVersion().onOrAfter(Version.V_2_14_0)) {
searchIdleReactivateCount = in.readVLong();
}
}
Expand Down Expand Up @@ -475,7 +475,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeVLong(queryConcurrency);
}

if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
if (out.getVersion().onOrAfter(Version.V_2_14_0)) {
out.writeVLong(searchIdleReactivateCount);
}
}
Expand Down
Loading