Use default constructor for RemoteStoreNodeStats

Signed-off-by: Lakshya Taragi <[email protected]>
ltaragi · Oct 1, 2024 · b0a71d2 · b0a71d2
1 parent 4e42331
commit b0a71d2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/server/src/main/java/org/opensearch/node/NodeService.java b/server/src/main/java/org/opensearch/node/NodeService.java
@@ -55,7 +55,6 @@
 import org.opensearch.ingest.IngestService;
 import org.opensearch.monitor.MonitorService;
 import org.opensearch.node.remotestore.RemoteStoreNodeStats;
-import org.opensearch.node.remotestore.RemoteStorePinnedTimestampService;
 import org.opensearch.plugins.PluginsService;
 import org.opensearch.ratelimitting.admissioncontrol.AdmissionControlService;
 import org.opensearch.repositories.RepositoriesService;
@@ -278,7 +277,7 @@ public NodeStats stats(
             repositoriesStats ? this.repositoriesService.getRepositoriesStats() : null,
             admissionControl ? this.admissionControlService.stats() : null,
             cacheService ? this.cacheService.stats(indices) : null,
-            remoteStoreNodeStats ? new RemoteStoreNodeStats(RemoteStorePinnedTimestampService.getPinnedTimestamps().v1()) : null
+            remoteStoreNodeStats ? new RemoteStoreNodeStats() : null
         );
     }
 

diff --git a/server/src/main/java/org/opensearch/node/remotestore/RemoteStoreNodeStats.java b/server/src/main/java/org/opensearch/node/remotestore/RemoteStoreNodeStats.java
@@ -31,8 +31,8 @@ public class RemoteStoreNodeStats implements Writeable, ToXContentFragment {
      */
     private final long lastSuccessfulFetchOfPinnedTimestamps;
 
-    public RemoteStoreNodeStats(final long lastSuccessfulFetchOfPinnedTimestamps) {
-        this.lastSuccessfulFetchOfPinnedTimestamps = lastSuccessfulFetchOfPinnedTimestamps;
+    public RemoteStoreNodeStats() {
+        this.lastSuccessfulFetchOfPinnedTimestamps = RemoteStorePinnedTimestampService.getPinnedTimestamps().v1();
     }
 
     public long getLastSuccessfulFetchOfPinnedTimestamps() {

diff --git a/server/src/test/java/org/opensearch/action/admin/cluster/node/stats/NodeStatsTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/node/stats/NodeStatsTests.java
@@ -1007,8 +1007,12 @@ public void apply(String action, AdmissionControlActionType admissionControlActi
 
         RemoteStoreNodeStats remoteStoreNodeStats = null;
         if (frequently()) {
-            long lastSuccessfulFetchOfPinnedTimestamps = randomNonNegativeLong();
-            remoteStoreNodeStats = new RemoteStoreNodeStats(lastSuccessfulFetchOfPinnedTimestamps);
+            remoteStoreNodeStats = new RemoteStoreNodeStats() {
+                @Override
+                public long getLastSuccessfulFetchOfPinnedTimestamps() {
+                    return 123456L;
+                }
+            };
         }
 
         // TODO: Only remote_store based aspects of NodeIndicesStats are being tested here.