Incorporate PR review feedback

Signed-off-by: Ashish Singh <[email protected]>
opensearch-project · Jan 28, 2023 · 105cbc5 · 105cbc5
1 parent d455c21
commit 105cbc5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/BufferedAsyncIOProcessor.java b/server/src/main/java/org/opensearch/common/util/concurrent/BufferedAsyncIOProcessor.java
@@ -60,7 +60,6 @@ private void scheduleProcess() {
                 threadpool.schedule(this::process, getBufferInterval(), getBufferRefreshThreadPoolName());
             } catch (Exception e) {
                 getLogger().error("failed to schedule process");
-                // process scheduling failure
                 processSchedulingFailure(e);
                 getPromiseSemaphore().release();
                 // This is to make sure that any new items that are added to the queue between processSchedulingFailure

diff --git a/server/src/main/java/org/opensearch/index/IndexSettings.java b/server/src/main/java/org/opensearch/index/IndexSettings.java
@@ -586,7 +586,7 @@ public final class IndexSettings {
     private final ReplicationType replicationType;
     private final boolean isRemoteStoreEnabled;
     private final boolean isRemoteTranslogStoreEnabled;
-    private volatile TimeValue bufferInterval;
+    private final TimeValue remoteTranslogUploadBufferInterval;
     private final String remoteStoreTranslogRepository;
     private final String remoteStoreRepository;
     private final boolean isRemoteSnapshot;
@@ -754,7 +754,10 @@ public IndexSettings(final IndexMetadata indexMetadata, final Settings nodeSetti
         isRemoteStoreEnabled = settings.getAsBoolean(IndexMetadata.SETTING_REMOTE_STORE_ENABLED, false);
         isRemoteTranslogStoreEnabled = settings.getAsBoolean(IndexMetadata.SETTING_REMOTE_TRANSLOG_STORE_ENABLED, false);
         remoteStoreTranslogRepository = settings.get(IndexMetadata.SETTING_REMOTE_TRANSLOG_STORE_REPOSITORY);
-        bufferInterval = settings.getAsTime(IndexMetadata.SETTING_REMOTE_TRANSLOG_BUFFER_INTERVAL, TimeValue.timeValueMillis(100));
+        remoteTranslogUploadBufferInterval = settings.getAsTime(
+            IndexMetadata.SETTING_REMOTE_TRANSLOG_BUFFER_INTERVAL,
+            TimeValue.timeValueMillis(100)
+        );
         remoteStoreRepository = settings.get(IndexMetadata.SETTING_REMOTE_STORE_REPOSITORY);
         isRemoteSnapshot = IndexModule.Type.REMOTE_SNAPSHOT.match(this.settings);
 
@@ -1142,12 +1145,8 @@ public void setTranslogSyncInterval(TimeValue translogSyncInterval) {
      * {@code index.translog.durability} is set as {@code request}.
      * @return the buffer interval.
      */
-    public TimeValue getBufferInterval() {
-        return bufferInterval;
-    }
-
-    public void setBufferInterval(TimeValue bufferInterval) {
-        this.bufferInterval = bufferInterval;
+    public TimeValue getRemoteTranslogUploadBufferInterval() {
+        return remoteTranslogUploadBufferInterval;
     }
 
     /**

diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -370,7 +370,7 @@ public IndexShard(
             threadPool,
             this::getEngine,
             indexSettings.isRemoteTranslogStoreEnabled(),
-            indexSettings.getBufferInterval()
+            indexSettings.getRemoteTranslogUploadBufferInterval()
         );
         this.mapperService = mapperService;
         this.indexCache = indexCache;

diff --git a/server/src/test/java/org/opensearch/index/IndexSettingsTests.java b/server/src/test/java/org/opensearch/index/IndexSettingsTests.java
@@ -970,7 +970,7 @@ public void testRemoteTranslogExplicitSetting() {
         IndexSettings settings = new IndexSettings(metadata, Settings.EMPTY);
         assertNull(settings.getRemoteStoreRepository());
         assertEquals("tlog-store", settings.getRemoteStoreTranslogRepository());
-        assertEquals(TimeValue.timeValueMillis(200), settings.getBufferInterval());
+        assertEquals(TimeValue.timeValueMillis(200), settings.getRemoteTranslogUploadBufferInterval());
     }
 
     public void testSetRemoteTranslogRepositoryFailsWhenRemoteTranslogIsNotEnabled() {