Make getter methods static for non dynamic settings in RemoteStoreSet…

…tings Signed-off-by: Sachin Kale <[email protected]>
sachinpkale · Aug 19, 2024 · 300d7ce · 300d7ce
1 parent 931e2b8
commit 300d7ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/server/src/main/java/org/opensearch/indices/RemoteStoreSettings.java b/server/src/main/java/org/opensearch/indices/RemoteStoreSettings.java
@@ -163,8 +163,8 @@ public class RemoteStoreSettings {
     private volatile RemoteStoreEnums.PathHashAlgorithm pathHashAlgorithm;
     private volatile int maxRemoteTranslogReaders;
     private volatile boolean isTranslogMetadataEnabled;
-    private volatile TimeValue pinnedTimestampsSchedulerInterval;
-    private volatile TimeValue pinnedTimestampsLookbackInterval;
+    private static volatile TimeValue pinnedTimestampsSchedulerInterval;
+    private static volatile TimeValue pinnedTimestampsLookbackInterval;
 
     public RemoteStoreSettings(Settings settings, ClusterSettings clusterSettings) {
         clusterRemoteTranslogBufferInterval = CLUSTER_REMOTE_TRANSLOG_BUFFER_INTERVAL_SETTING.get(settings);
@@ -273,11 +273,11 @@ private void setMaxRemoteTranslogReaders(int maxRemoteTranslogReaders) {
         this.maxRemoteTranslogReaders = maxRemoteTranslogReaders;
     }
 
-    public TimeValue getPinnedTimestampsSchedulerInterval() {
+    public static TimeValue getPinnedTimestampsSchedulerInterval() {
         return pinnedTimestampsSchedulerInterval;
     }
 
-    public TimeValue getPinnedTimestampsLookbackInterval() {
+    public static TimeValue getPinnedTimestampsLookbackInterval() {
         return pinnedTimestampsLookbackInterval;
     }
 }
diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java
@@ -818,8 +818,7 @@ protected Node(
                     repositoriesServiceReference::get,
                     settings,
                     threadPool,
-                    clusterService,
-                    remoteStoreSettings
+                    clusterService
                 );
                 resourcesToClose.add(remoteStorePinnedTimestampService);
             } else {

diff --git a/server/src/main/java/org/opensearch/node/remotestore/RemoteStorePinnedTimestampService.java b/server/src/main/java/org/opensearch/node/remotestore/RemoteStorePinnedTimestampService.java
@@ -57,7 +57,6 @@ public class RemoteStorePinnedTimestampService implements Closeable {
     private final Settings settings;
     private final ThreadPool threadPool;
     private final ClusterService clusterService;
-    private final RemoteStoreSettings remoteStoreSettings;
     private BlobStoreRepository blobStoreRepository;
     private BlobStoreTransferService blobStoreTransferService;
     private RemoteStorePinnedTimestampsBlobStore pinnedTimestampsBlobStore;
@@ -68,14 +67,12 @@ public RemoteStorePinnedTimestampService(
         Supplier<RepositoriesService> repositoriesService,
         Settings settings,
         ThreadPool threadPool,
-        ClusterService clusterService,
-        RemoteStoreSettings remoteStoreSettings
+        ClusterService clusterService
     ) {
         this.repositoriesService = repositoriesService;
         this.settings = settings;
         this.threadPool = threadPool;
         this.clusterService = clusterService;
-        this.remoteStoreSettings = remoteStoreSettings;
     }
 
     /**
@@ -86,7 +83,7 @@ public RemoteStorePinnedTimestampService(
     public void start() {
         validateRemoteStoreConfiguration();
         initializeComponents();
-        startAsyncUpdateTask(remoteStoreSettings.getPinnedTimestampsSchedulerInterval());
+        startAsyncUpdateTask(RemoteStoreSettings.getPinnedTimestampsSchedulerInterval());
     }
 
     private void validateRemoteStoreConfiguration() {
@@ -126,7 +123,7 @@ private void startAsyncUpdateTask(TimeValue pinnedTimestampsSchedulerInterval) {
     public void pinTimestamp(long timestamp, String pinningEntity, ActionListener<Void> listener) {
         // If a caller uses current system time to pin the timestamp, following check will almost always fail.
         // So, we allow pinning timestamp in the past upto some buffer
-        long lookbackIntervalInMills = remoteStoreSettings.getPinnedTimestampsLookbackInterval().millis();
+        long lookbackIntervalInMills = RemoteStoreSettings.getPinnedTimestampsLookbackInterval().millis();
         if (timestamp < (System.currentTimeMillis() - lookbackIntervalInMills)) {
             throw new IllegalArgumentException(
                 "Timestamp to be pinned is less than current timestamp - value of cluster.remote_store.pinned_timestamps.lookback_interval"