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

[Backport 2.x] Add a counter to node stat api to track shard going from idle to non-idle #12956

Closed
wants to merge 2 commits into from
Closed

[Backport 2.x] Add a counter to node stat api to track shard going from idle to non-idle #12956

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
5839e47
add metrics to tack idle shard waking up
ruai0511 Mar 19, 2024
d4ba4de
Merge branch 'main' into backport/backport-12768-to-2.x
ruai0511 Mar 28, 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
12 changes: 6 additions & 6 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"
reason: search idle reactivate count total is only added in 3.0.0
version: " - 2.13.99"
reason: search idle reactivate count total is only added in 2.14.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
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/index/shard/SearchOperationListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ public void onSearchIdleReactivation() {
try {
listener.onSearchIdleReactivation();
} catch (Exception e) {
logger.warn(() -> new ParameterizedMessage("onNewSearchIdleReactivation listener [{}] failed", listener), e);
logger.warn(() -> new ParameterizedMessage("onSearchIdleReactivation listener [{}] failed", listener), e);
}
}
}
Expand Down
Loading