Skip to content

Commit 1ceee94

Browse files
2.x specific changes
Signed-off-by: Bharathwaj G <bharath78910@gmail.com>
1 parent 59cf669 commit 1ceee94

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55

66
## [Unreleased 2.x]
77
### Added
8+
- [Admission control] Add Resource usage collector service and resource usage tracker ([#10695](https://github.com/opensearch-project/OpenSearch/pull/10695))
89

910
### Dependencies
1011
- Bumps jetty version to 9.4.52.v20230823 to fix GMS-2023-1857 ([#9822](https://github.com/opensearch-project/OpenSearch/pull/9822))

server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public NodeStats(StreamInput in) throws IOException {
215215
} else {
216216
searchPipelineStats = null;
217217
}
218-
if (in.getVersion().onOrAfter(Version.V_3_0_0)) { // make it 2.12 when we backport
218+
if (in.getVersion().onOrAfter(Version.V_2_12_0)) {
219219
resourceUsageStats = in.readOptionalWriteable(NodesResourceUsageStats::new);
220220
} else {
221221
resourceUsageStats = null;
@@ -465,7 +465,7 @@ public void writeTo(StreamOutput out) throws IOException {
465465
if (out.getVersion().onOrAfter(Version.V_2_9_0)) {
466466
out.writeOptionalWriteable(searchPipelineStats);
467467
}
468-
if (out.getVersion().onOrAfter(Version.V_3_0_0)) { // make it 2.12 when we backport
468+
if (out.getVersion().onOrAfter(Version.V_2_12_0)) {
469469
out.writeOptionalWriteable(resourceUsageStats);
470470
}
471471
}

0 commit comments

Comments
 (0)