Adding comments and removing log statements

Signed-off-by: Rishikesh1159 <[email protected]>
opensearch-project · Apr 11, 2022 · bdc071d · bdc071d
1 parent df7a777
commit bdc071d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/...src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationIT.java b/...src/internalClusterTest/java/org/opensearch/indices/replication/SegmentReplicationIT.java
@@ -230,7 +230,7 @@ public void onFailure(Exception e) {
         });
     }
 
-    public void testDelOps()throws Exception{
+    public void testDeleteOperations()throws Exception{
         final String nodeA = internalCluster().startNode();
         final String nodeB = internalCluster().startNode();
 

diff --git a/server/src/main/java/org/opensearch/index/engine/InternalEngine.java b/server/src/main/java/org/opensearch/index/engine/InternalEngine.java
@@ -702,11 +702,12 @@ private ExternalReaderManager createReaderManager(RefreshWarmerListener external
     }
 
     private DirectoryReader getDirectoryReader() throws IOException {
-        // for segment replication: replicas should create the reader from store, we don't want an open IW on replicas.
+        // for segment replication: replicas should create the reader from store and, we don't want an open IW on replicas.
+        // We should always wrap replicas with a SoftDeletesDirectoryReaderWrapper as we use soft deletes when segment replication is on for deletions
         if (engineConfig.isReadOnly()) {
             return new SoftDeletesDirectoryReaderWrapper(DirectoryReader.open(store.directory()), Lucene.SOFT_DELETES_FIELD);
         }
-        return DirectoryReader.open(indexWriter);
+        return DirectoryReader.open(indexWriter, true, true);
     }
 
     @Override
@@ -2295,6 +2296,7 @@ public SegmentInfos getLatestSegmentInfos() {
         OpenSearchDirectoryReader reader = null;
         try {
             reader = externalReaderManager.internalReaderManager.acquire();
+            // This is safe, as we always wrap Standard reader with a SoftDeletesDirectoryReaderWrapper for replicas when segment replication is enabled
             if (engineConfig.isReadOnly()) {
                 return ((StandardDirectoryReader)((SoftDeletesDirectoryReaderWrapper) reader.getDelegate()).getDelegate()).getSegmentInfos();
             }

diff --git a/server/src/main/java/org/opensearch/index/engine/OpenSearchReaderManager.java b/server/src/main/java/org/opensearch/index/engine/OpenSearchReaderManager.java
@@ -92,18 +92,11 @@ protected OpenSearchDirectoryReader refreshIfNeeded(OpenSearchDirectoryReader re
         // If not using NRT repl.
         if (currentInfos == null) {
             reader = (OpenSearchDirectoryReader) DirectoryReader.openIfChanged(referenceToRefresh);
-            if (reader != null) {
-                logger.info("Num docs primary {}", reader.getDelegate().numDocs());
-            }
         } else {
             // Open a new reader, sharing any common segment readers with the old one:
             DirectoryReader innerReader = StandardDirectoryReader.open(referenceToRefresh.directory(), currentInfos, subs, null);
             final DirectoryReader softDeletesDirectoryReaderWrapper = new SoftDeletesDirectoryReaderWrapper(innerReader, Lucene.SOFT_DELETES_FIELD);
-            logger.info("Doc count {}", softDeletesDirectoryReaderWrapper.numDocs());
-            logger.info("Deleted doc count {}", softDeletesDirectoryReaderWrapper.numDeletedDocs());
             reader = OpenSearchDirectoryReader.wrap(softDeletesDirectoryReaderWrapper, referenceToRefresh.shardId());
-            logger.info("reader Doc count {}", reader.numDocs());
-            logger.info("reader Deleted doc count {}", reader.numDeletedDocs());
             logger.trace("updated to SegmentInfosVersion=" + currentInfos.getVersion() + " reader=" + innerReader);
         }
         return reader;