version 3.0

Signed-off-by: Poojita Raj <poojiraj@amazon.com>
opensearch-project · Sep 4, 2023 · 0e64471 · 0e64471
1 parent 01d4dfe
commit 0e64471
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/index/engine/SegmentsStats.java b/server/src/main/java/org/opensearch/index/engine/SegmentsStats.java
@@ -122,9 +122,12 @@ public SegmentsStats(StreamInput in) throws IOException {
         fileSizes = in.readMap(StreamInput::readString, StreamInput::readLong);
         if (in.getVersion().onOrAfter(Version.V_2_10_0)) {
             remoteSegmentStats = in.readOptionalWriteable(RemoteSegmentStats::new);
-            replicationStats = in.readOptionalWriteable(ReplicationStats::new);
         } else {
             remoteSegmentStats = new RemoteSegmentStats();
+        }
+        if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+            replicationStats = in.readOptionalWriteable(ReplicationStats::new);
+        } else {
             replicationStats = new ReplicationStats();
         }
     }
@@ -326,6 +329,8 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeMap(this.fileSizes, StreamOutput::writeString, StreamOutput::writeLong);
         if (out.getVersion().onOrAfter(Version.V_2_10_0)) {
             out.writeOptionalWriteable(remoteSegmentStats);
+        }
+        if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
             out.writeOptionalWriteable(replicationStats);
         }
     }

diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -2944,7 +2944,7 @@ public Set<SegmentReplicationShardStats> getReplicationStatsForTrackedReplicas()
     }
 
     public ReplicationStats getReplicationStats() {
-        if (indexSettings.isSegRepEnabled()) {
+        if (indexSettings.isSegRepEnabled() && routingEntry().primary()) {
             final Set<SegmentReplicationShardStats> stats = getReplicationStatsForTrackedReplicas();
             long maxBytesBehind = stats.stream().mapToLong(SegmentReplicationShardStats::getBytesBehindCount).max().orElse(0L);
             long totalBytesBehind = stats.stream().mapToLong(SegmentReplicationShardStats::getBytesBehindCount).sum();
@@ -2954,7 +2954,7 @@ public ReplicationStats getReplicationStats() {
                 .orElse(0L);
             return new ReplicationStats(maxBytesBehind, totalBytesBehind, maxReplicationLag);
         }
-        return null;
+        return new ReplicationStats();
     }
 
     /**