Revert "Adding subshard work items on lease expiry"

opensearch-project · Dec 6, 2024 · 4a1e525 · 4a1e525
1 parent d7681d2
commit 4a1e525
Show file tree

Hide file tree

Showing 32 changed files with 383 additions and 1,219 deletions.
diff --git a/DataGenerator/src/main/java/org/opensearch/migrations/data/WorkloadGenerator.java b/DataGenerator/src/main/java/org/opensearch/migrations/data/WorkloadGenerator.java
@@ -53,8 +53,7 @@ private List<CompletableFuture<?>> generateDocs(String indexName, Workload workl
                 log.atTrace().setMessage("Created doc for index {}: {}")
                     .addArgument(indexName)
                     .addArgument(doc::toString).log();
-                var docId = docIdCounter.incrementAndGet();
-                return new BulkDocSection(indexName + "_" + docId, indexName, null, doc.toString(), null);
+                return new BulkDocSection(indexName + "_" + docIdCounter.incrementAndGet(), indexName, null, doc.toString());
             })
             .collect(Collectors.toList());
 

diff --git a/...ntsFromSnapshotMigration/src/main/java/org/opensearch/migrations/RfsMigrateDocuments.java b/...ntsFromSnapshotMigration/src/main/java/org/opensearch/migrations/RfsMigrateDocuments.java
diff --git a/...romSnapshotMigration/src/test/java/org/opensearch/migrations/RfsMigrateDocumentsTest.java b/...romSnapshotMigration/src/test/java/org/opensearch/migrations/RfsMigrateDocumentsTest.java
diff --git a/...sFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java b/...sFromSnapshotMigration/src/test/java/org/opensearch/migrations/bulkload/EndToEndTest.java
@@ -1,7 +1,6 @@
 package org.opensearch.migrations.bulkload;
 
 import java.io.File;
-import java.time.Duration;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
@@ -127,21 +126,18 @@ private void migrationDocumentsWithClusters(
             final var clockJitter = new Random(1);
 
             // ExpectedMigrationWorkTerminationException is thrown on completion.
-            var expectedTerminationException = Assertions.assertTimeout(
-                Duration.ofSeconds(30),
-                () -> Assertions.assertThrows(
-                    ExpectedMigrationWorkTerminationException.class,
-                    () -> migrateDocumentsSequentially(
-                        sourceRepo,
-                        snapshotName,
-                        List.of(),
-                        targetCluster.getUrl(),
-                        runCounter,
-                        clockJitter,
-                        testDocMigrationContext,
-                        sourceCluster.getContainerVersion().getVersion(),
-                        false
-                    )
+            var expectedTerminationException = Assertions.assertThrows(
+                ExpectedMigrationWorkTerminationException.class,
+                () -> migrateDocumentsSequentially(
+                    sourceRepo,
+                    snapshotName,
+                    List.of(),
+                    targetCluster.getUrl(),
+                    runCounter,
+                    clockJitter,
+                    testDocMigrationContext,
+                    sourceCluster.getContainerVersion().getVersion(),
+                    false
                 )
             );