Changing logic to Just trigger refresh, and leave trimtranslog on Aft…

…erWriteAction, which trims unreferenced translog readers after every write Signed-off-by: Shubh Sahu <[email protected]>
opensearch-project · Apr 3, 2024 · 5f4ca3a · 5f4ca3a
1 parent f24757d
commit 5f4ca3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/server/src/main/java/org/opensearch/index/IndexSettings.java b/server/src/main/java/org/opensearch/index/IndexSettings.java
@@ -1119,7 +1119,7 @@ public IndexSettings(final IndexMetadata indexMetadata, final Settings nodeSetti
             INDEX_DOC_ID_FUZZY_SET_FALSE_POSITIVE_PROBABILITY_SETTING,
             this::setDocIdFuzzySetFalsePositiveProbability
         );
-        scopedSettings.addSettingsUpdateConsumer(INDEX_MAX_UNCOMMITTED_TRANSLOG_FILES,this::setMaxUncommittedTranslogFiles);
+        scopedSettings.addSettingsUpdateConsumer(INDEX_MAX_UNCOMMITTED_TRANSLOG_FILES, this::setMaxUncommittedTranslogFiles);
     }
 
     private void setMaxUncommittedTranslogFiles(int maxUncommittedTranslogFiles) {

diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -4489,7 +4489,7 @@ public Durability getTranslogDurability() {
      * threshold count determined by {@code index.translog.max_uncommitted_files_threshold}
      * @return {@code true} if the shard should be Refreshed
      */
-    boolean shouldRefreshShard(){
+    boolean shouldRefreshShard() {
         final Engine engine = getEngineOrNull();
         if (engine != null) {
             try {
@@ -4503,17 +4503,11 @@ boolean shouldRefreshShard(){
 
     private final AtomicBoolean isRefreshRunning = new AtomicBoolean();
 
-    /**
-     * Will Call a blocking Refresh and then Trim the Unreferenced Translog files
-     */
-    private void refreshAndTrimTranslogfiles(String source) throws IOException {
-        refresh(source);
-        getEngine().translogManager().trimUnreferencedTranslogFiles();
-    }
-
     /**
      * Schedules a flush or translog generation roll if needed but will not schedule more than one concurrently. The operation will be
      * executed asynchronously on the flush thread pool.
+     * Also Schedules a refresh if Number of Translog files breaches the threshold count determined by
+     * {@code index.translog.max_uncommitted_files_threshold}
      */
     public void afterWriteOperation() {
         if (shouldPeriodicallyFlush() || shouldRollTranslogGeneration()) {
@@ -4579,15 +4573,15 @@ public void onAfter() {
 
             if (shouldRefreshShard()) {
                 logger.info("submitting async Refresh request");
-                final AbstractRunnable refreshAndTrimTranslog = new AbstractRunnable() {
+                final AbstractRunnable _refresh = new AbstractRunnable() {
                     @Override
                     public void onFailure(Exception e) {
                         logger.warn("forced refresh failed after number of uncommited translog files breached limit", e);
                     }
 
                     @Override
                     protected void doRun() throws Exception {
-                        refreshAndTrimTranslogfiles("Too many uncommited Translog files");
+                        refresh("Too many uncommited Translog files");
                     }
 
                     @Override
@@ -4600,7 +4594,7 @@ public void onAfter() {
                         isRefreshRunning.compareAndSet(true, false);
                     }
                 };
-                threadPool.executor(ThreadPool.Names.REFRESH).execute(refreshAndTrimTranslog);
+                threadPool.executor(ThreadPool.Names.REFRESH).execute(_refresh);
             } else {
                 isRefreshRunning.compareAndSet(true, false);
             }