Fix NodeStats bwc tests..

Signed-off-by: Marc Handalian <[email protected]>
opensearch-project · Mar 2, 2023 · 51e9fb2 · 51e9fb2
1 parent 3f9d1f3
commit 51e9fb2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 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
@@ -163,13 +163,6 @@ public NodeStats(StreamInput in) throws IOException {
         }
         indexingPressureStats = in.readOptionalWriteable(IndexingPressureStats::new);
         shardIndexingPressureStats = in.readOptionalWriteable(ShardIndexingPressureStats::new);
-
-        if (in.getVersion().onOrAfter(Version.V_2_7_0)) {
-            segmentReplicationStats = in.readOptionalWriteable(SegmentReplicationStats::new);
-        } else {
-            segmentReplicationStats = null;
-        }
-
         if (in.getVersion().onOrAfter(Version.V_2_4_0)) {
             searchBackpressureStats = in.readOptionalWriteable(SearchBackpressureStats::new);
         } else {
@@ -191,6 +184,11 @@ public NodeStats(StreamInput in) throws IOException {
         } else {
             fileCacheStats = null;
         }
+        if (in.getVersion().onOrAfter(Version.V_3_0_0) && FeatureFlags.isEnabled(FeatureFlags.REPLICATION_TYPE)) {
+            segmentReplicationStats = in.readOptionalWriteable(SegmentReplicationStats::new);
+        } else {
+            segmentReplicationStats = null;
+        }
     }
 
     public NodeStats(
@@ -398,10 +396,6 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalWriteable(indexingPressureStats);
         out.writeOptionalWriteable(shardIndexingPressureStats);
 
-        if (out.getVersion().onOrAfter(Version.V_2_7_0)) {
-            out.writeOptionalWriteable(segmentReplicationStats);
-        }
-
         if (out.getVersion().onOrAfter(Version.V_2_4_0)) {
             out.writeOptionalWriteable(searchBackpressureStats);
         }
@@ -414,6 +408,9 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getVersion().onOrAfter(Version.V_3_0_0) && FeatureFlags.isEnabled(FeatureFlags.SEARCHABLE_SNAPSHOT)) {
             out.writeOptionalWriteable(fileCacheStats);
         }
+        if (out.getVersion().onOrAfter(Version.V_3_0_0) && FeatureFlags.isEnabled(FeatureFlags.REPLICATION_TYPE)) {
+            out.writeOptionalWriteable(segmentReplicationStats);
+        }
     }
 
     @Override
@@ -486,9 +483,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         if (getShardIndexingPressureStats() != null) {
             getShardIndexingPressureStats().toXContent(builder, params);
         }
-        if (getSegmentReplicationStats() != null) {
-            getSegmentReplicationStats().toXContent(builder, params);
-        }
         if (getSearchBackpressureStats() != null) {
             getSearchBackpressureStats().toXContent(builder, params);
         }
@@ -501,7 +495,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         if (getFileCacheStats() != null && FeatureFlags.isEnabled(FeatureFlags.SEARCHABLE_SNAPSHOT)) {
             getFileCacheStats().toXContent(builder, params);
         }
-
+        if (getSegmentReplicationStats() != null && FeatureFlags.isEnabled(FeatureFlags.REPLICATION_TYPE)) {
+            getSegmentReplicationStats().toXContent(builder, params);
+        }
         return builder;
     }
 }
diff --git a/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java b/server/src/main/java/org/opensearch/index/seqno/ReplicationTracker.java
@@ -1190,7 +1190,7 @@ public synchronized void updateVisibleCheckpointForShard(final String allocation
             });
             cps.lastCompletedReplicationLag = lastFinished.get();
         }
-        logger.info(
+        logger.trace(
             () -> new ParameterizedMessage(
                 "updated local knowledge for [{}] on the primary of the visible checkpoint from [{}] to [{}], active timers {}",
                 allocationId,
@@ -1222,7 +1222,7 @@ public synchronized void setLatestReplicationCheckpoint(ReplicationCheckpoint ch
                             replicationTimer.start();
                             return replicationTimer;
                         });
-                        logger.info(
+                        logger.trace(
                             () -> new ParameterizedMessage(
                                 "updated last published checkpoint to {} - timers [{}]",
                                 checkpoint,