Revert "Fixing few of the Flaky tests related to derived source tests (opensearch-project#18493)"

This reverts commit 674de10.

Author: andrross

server/src/internalClusterTest/java/org/opensearch/recovery/FullRollingRestartIT.java

@@ -453,7 +453,7 @@ public void testDerivedSourceRollingRestart() throws Exception {
         rollingRestartWithVerification(docCount);
     }
 
-    public void testDerivedSourceWithMultiFieldsRollingRestart() throws Exception {
+    public void testDerivedSourceWithMixedVersionRollingRestart() throws Exception {
         String mapping = """
             {
               "properties": {
@@ -503,12 +503,12 @@ public void testDerivedSourceWithMultiFieldsRollingRestart() throws Exception {
 
         // Add replicas before starting new nodes
         assertAcked(
-            client().admin().indices().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.number_of_replicas", 1))
+            client().admin().indices().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.number_of_replicas", 2))
         );
 
         // Add nodes and additional documents
         int totalDocs = docCount;
-        for (int i = 0; i < 1; i++) {
+        for (int i = 0; i < 2; i++) {
             internalCluster().startNode();
 
             // Add more documents
@@ -564,7 +564,7 @@ public void testDerivedSourceWithConcurrentUpdatesRollingRestart() throws Except
             prepareCreate(
                 "test",
                 Settings.builder()
-                    .put("index.number_of_shards", 2)
+                    .put("index.number_of_shards", 3)
                     .put("index.number_of_replicas", 0)
                     .put("index.derived_source.enabled", true)
                     .put("index.refresh_interval", "1s")
@@ -601,86 +601,74 @@ public void testDerivedSourceWithConcurrentUpdatesRollingRestart() throws Except
 
         // Start concurrent updates during rolling restart
         logger.info("--> starting rolling restart with concurrent updates");
+        concurrentUpdatesRollingRestartWithVerification(docCount);
+    }
 
-        final AtomicBoolean stop = new AtomicBoolean(false);
-        final AtomicInteger successfulUpdates = new AtomicInteger(0);
-        final CountDownLatch updateLatch = new CountDownLatch(1);
-        final Thread updateThread = new Thread(() -> {
+    private void concurrentUpdatesRollingRestartWithVerification(int initialDocCount) throws Exception {
+        AtomicBoolean stop = new AtomicBoolean(false);
+        AtomicInteger totalUpdates = new AtomicInteger(0);
+        CountDownLatch updateLatch = new CountDownLatch(1);
+
+        // Start concurrent update thread
+        Thread updateThread = new Thread(() -> {
             try {
-                updateLatch.await();
+                updateLatch.await(); // Wait for cluster to be ready
                 while (stop.get() == false) {
                     try {
-                        // Update documents sequentially to avoid conflicts
-                        for (int i = 0; i < docCount && !stop.get(); i++) {
-                            client().prepareUpdate("test", String.valueOf(i))
-                                .setRetryOnConflict(3)
-                                .setDoc("counter", successfulUpdates.get() + 1, "last_updated", System.currentTimeMillis(), "version", 1)
-                                .execute()
-                                .actionGet(TimeValue.timeValueSeconds(5));
-                            successfulUpdates.incrementAndGet();
-                            Thread.sleep(50); // Larger delay between updates
-                        }
+                        int docId = randomIntBetween(0, initialDocCount - 1);
+                        client().prepareUpdate("test", String.valueOf(docId))
+                            .setRetryOnConflict(3)
+                            .setDoc("counter", randomIntBetween(0, 1000), "last_updated", System.currentTimeMillis(), "version", 1)
+                            .execute()
+                            .actionGet();
+                        totalUpdates.incrementAndGet();
+                        Thread.sleep(10);
                     } catch (Exception e) {
-                        if (stop.get() == false) {
-                            logger.warn("Error in update thread", e);
+                        if (e instanceof InterruptedException) {
+                            break;
                         }
+                        logger.warn("Error in update thread", e);
                     }
                 }
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
             }
         });
+        updateThread.start();
 
         try {
             // Add replicas
             assertAcked(
-                client().admin().indices().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.number_of_replicas", 1))
+                client().admin().indices().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.number_of_replicas", 2))
             );
 
             // Start additional nodes
-            for (int i = 0; i < 1; i++) {
+            for (int i = 0; i < 2; i++) {
                 internalCluster().startNode();
             }
             ensureGreen("test");
 
-            // Start updates after cluster is stable
-            updateThread.start();
+            // Start updates
             updateLatch.countDown();
 
             // Wait for some updates to occur
-            assertBusy(() -> { assertTrue("No successful updates occurred", successfulUpdates.get() > 0); }, 30, TimeUnit.SECONDS);
+            Thread.sleep(2000);
 
             // Rolling restart of all nodes
             for (String node : internalCluster().getNodeNames()) {
-                // Stop updates temporarily during node restart
-                stop.set(true);
-                Thread.sleep(1000); // Wait for in-flight operations to complete
-
                 internalCluster().restartNode(node);
-                ensureGreen(TimeValue.timeValueSeconds(60));
-
-                // Verify data consistency
-                refresh("test");
-                verifyDerivedSourceWithUpdates(docCount);
-
-                // Resume updates
-                stop.set(false);
+                ensureGreen(TimeValue.timeValueMinutes(2));
+                verifyDerivedSourceWithUpdates(initialDocCount);
             }
-
         } finally {
-            // Clean shutdown
             stop.set(true);
-            updateThread.join(TimeValue.timeValueSeconds(30).millis());
-            if (updateThread.isAlive()) {
-                updateThread.interrupt();
-                updateThread.join(TimeValue.timeValueSeconds(5).millis());
-            }
+            updateThread.join();
         }
 
-        logger.info("--> performed {} successful updates during rolling restart", successfulUpdates.get());
+        logger.info("--> performed {} concurrent updates during rolling restart", totalUpdates.get());
         refresh("test");
         flush("test");
-        verifyDerivedSourceWithUpdates(docCount);
+        verifyDerivedSourceWithUpdates(initialDocCount);
     }
 
     private void verifyDerivedSourceWithUpdates(int expectedDocs) throws Exception {
@@ -699,8 +687,7 @@ private void verifyDerivedSourceWithUpdates(int expectedDocs) throws Exception {
                 assertEquals("text value " + id, source.get("text_field"));
                 assertNotNull("counter missing for doc " + id, source.get("counter"));
                 assertFalse(((String) source.get("last_updated")).isEmpty());
-                Integer counter = (Integer) source.get("counter");
-                assertEquals(counter == 0 ? 0 : 1, source.get("version"));
+                assertEquals(1, source.get("version"));
 
                 // Verify text_field maintains original value
                 assertEquals("text value " + id, source.get("text_field"));

server/src/internalClusterTest/java/org/opensearch/recovery/RecoveryWhileUnderLoadIT.java

@@ -749,7 +749,6 @@ protected XContentBuilder generateSource(long id, Random random) throws IOExcept
                     .endObject();
             }
         }) {
-            indexer.setUseAutoGeneratedIDs(true);
             logger.info("--> waiting for {} docs to be indexed ...", waitFor);
             waitForDocs(waitFor, indexer);
             indexer.assertNoFailures();
@@ -770,10 +769,7 @@ protected XContentBuilder generateSource(long id, Random random) throws IOExcept
             allowNodes("test", 2);
 
             logger.info("--> waiting for GREEN health status ...");
-            // make sure the cluster state is green, and all has been recovered
-            assertNoTimeout(
-                client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout("5m").setWaitForGreenStatus()
-            );
+            ensureGreen(TimeValue.timeValueMinutes(2));
 
             logger.info("--> waiting for {} docs to be indexed ...", totalNumDocs);
             waitForDocs(totalNumDocs, indexer);
@@ -862,7 +858,6 @@ protected XContentBuilder generateSource(long id, Random random) throws IOExcept
             }
         }) {
 
-            indexer.setUseAutoGeneratedIDs(true);
             for (int i = 0; i < numDocs; i += scaledRandomIntBetween(500, Math.min(1000, numDocs))) {
                 indexer.assertNoFailures();
                 logger.info("--> waiting for {} docs to be indexed ...", i);

server/src/test/java/org/opensearch/common/lucene/index/DerivedSourceLeafReaderTests.java

@@ -18,7 +18,6 @@
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.index.NoMergePolicy;
 import org.apache.lucene.index.StoredFieldVisitor;
 import org.apache.lucene.index.StoredFields;
 import org.apache.lucene.store.Directory;
@@ -146,9 +145,7 @@ public void testGetCoreAndReaderCacheHelper() {
 
     public void testWithRandomDocuments() throws IOException {
         Directory randomDir = newDirectory();
-        IndexWriterConfig config = newIndexWriterConfig(random(), null).setCodec(new RandomCodec(random()))
-            .setMergePolicy(NoMergePolicy.INSTANCE); // Prevent automatic merges
-
+        IndexWriterConfig config = newIndexWriterConfig(random(), null).setCodec(new RandomCodec(random()));
         IndexWriter randomWriter = new IndexWriter(randomDir, config);
 
         int numDocs = randomIntBetween(1, 10);
@@ -161,14 +158,9 @@ public void testWithRandomDocuments() throws IOException {
             doc.add(new StoredField("_source", source));
             randomWriter.addDocument(doc);
         }
-
-        // Force merge into a single segment
-        randomWriter.forceMerge(1);
         randomWriter.commit();
 
         DirectoryReader randomDirectoryReader = DirectoryReader.open(randomWriter);
-        assertEquals("Should have exactly one segment", 1, randomDirectoryReader.leaves().size());
-
         LeafReader randomLeafReader = randomDirectoryReader.leaves().get(0).reader();
         DerivedSourceLeafReader randomDerivedReader = new DerivedSourceLeafReader(
             randomLeafReader,

server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java

@@ -8233,16 +8233,14 @@ public void testGetMaxSeqNoFromSegmentInfosConcurrentWrites() throws IOException
     }
 
     public void testNewChangesSnapshotWithDerivedSource() throws IOException {
-        IOUtils.close(engine, store);
+
         // Create test documents
         List<Engine.Operation> operations = new ArrayList<>();
         final int numDocs = randomIntBetween(1, 100);
 
         try (Store store = createStore()) {
             EngineConfig engineConfig = createEngineConfigWithMapperSupplierForDerivedSource(store);
-            InternalEngine engine = null;
-            try {
-                engine = createEngine(engineConfig);
+            try (InternalEngine engine = createEngine(engineConfig)) {
                 // Index documents
                 for (int i = 0; i < numDocs; i++) {
                     ParsedDocument doc = testParsedDocument(
@@ -8296,24 +8294,19 @@ public void testNewChangesSnapshotWithDerivedSource() throws IOException {
                     // Verify we got all documents
                     assertThat(count, equalTo(numDocs));
                 }
-            } finally {
-                IOUtils.close(engine, store);
             }
         }
     }
 
-    public void testNewChangesSnapshotWithDeleteAndUpdateWithDerivedSource() throws IOException {
-        IOUtils.close(engine, store);
+    public void testNewChangesSnapshotWithDeleteAndUpdate() throws IOException {
         final List<Engine.Operation> operations = new ArrayList<>();
         int numDocs = randomIntBetween(10, 100);
         int numDocsToDelete = randomIntBetween(1, numDocs / 2);
         Set<String> deletedDocs = new HashSet<>();
 
         try (Store store = createStore()) {
             EngineConfig engineConfig = createEngineConfigWithMapperSupplierForDerivedSource(store);
-            InternalEngine engine = null;
-            try {
-                engine = createEngine(engineConfig);
+            try (InternalEngine engine = createEngine(engineConfig)) {
                 // First index documents
                 for (int i = 0; i < numDocs; i++) {
                     ParsedDocument doc = testParsedDocument(
@@ -8458,8 +8451,6 @@ public void testNewChangesSnapshotWithDeleteAndUpdateWithDerivedSource() throws
                     }
                     assertEquals("Expected number of operations in range", to - from + 1, count);
                 }
-            } finally {
-                IOUtils.close(engine, store);
             }
         }
     }