Update version check made in PR opensearch-project#10656. (opensearch…

…-project#10835) Signed-off-by: Rishikesh1159 <[email protected]> Signed-off-by: Shivansh Arora <[email protected]>
Gaurav614 · Apr 25, 2024 · a82b823 · a82b823
1 parent 7301328
commit a82b823
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java
@@ -215,8 +215,7 @@ public NodeStats(StreamInput in) throws IOException {
  } else {
  resourceUsageStats = null;
  }
- // TODO: change to V_2_12_0 on main after backport to 2.x
- if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+ if (in.getVersion().onOrAfter(Version.V_2_12_0)) {
  segmentReplicationRejectionStats = in.readOptionalWriteable(SegmentReplicationRejectionStats::new);
  } else {
  segmentReplicationRejectionStats = null;
@@ -431,6 +430,7 @@ public SegmentReplicationRejectionStats getSegmentReplicationRejectionStats() {
  return segmentReplicationRejectionStats;
  }
 
+ @Nullable
  public RepositoriesStats getRepositoriesStats() {
  return repositoriesStats;
  }
@@ -481,8 +481,7 @@ public void writeTo(StreamOutput out) throws IOException {
  if (out.getVersion().onOrAfter(Version.V_2_12_0)) {
  out.writeOptionalWriteable(resourceUsageStats);
  }
- // TODO: change to V_2_12_0 on main after backport to 2.x
- if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+ if (out.getVersion().onOrAfter(Version.V_2_12_0)) {
  out.writeOptionalWriteable(segmentReplicationRejectionStats);
  }
  if (out.getVersion().onOrAfter(Version.V_2_12_0)) {

diff --git a/server/src/main/java/org/opensearch/index/SegmentReplicationRejectionStats.java b/server/src/main/java/org/opensearch/index/SegmentReplicationRejectionStats.java
@@ -34,8 +34,7 @@ public SegmentReplicationRejectionStats(final long totalRejectionCount) {
  }
 
  public SegmentReplicationRejectionStats(StreamInput in) throws IOException {
- // TODO: change to V_2_12_0 on main after backport to 2.x
- if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+ if (in.getVersion().onOrAfter(Version.V_2_12_0)) {
  this.totalRejectionCount = in.readVLong();
  }
  }
@@ -53,8 +52,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
  @Override
  public void writeTo(StreamOutput out) throws IOException {
- // TODO: change to V_2_12_0 on main after backport to 2.x
- if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+ if (out.getVersion().onOrAfter(Version.V_2_12_0)) {
  out.writeVLong(totalRejectionCount);
  }
  }