Revert "Initial restart upgrade bwc test"

This reverts commit 2c00025. Signed-off-by: Ryan Bogan <[email protected]>
opensearch-project · Dec 2, 2024 · 71b1d76 · 71b1d76
1 parent 2c00025
commit 71b1d76
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java
@@ -26,12 +26,8 @@
 public class HybridSearchIT extends AbstractRestartUpgradeRestTestCase {
     private static final String PIPELINE_NAME = "nlp-hybrid-pipeline";
     private static final String PIPELINE1_NAME = "nlp-hybrid-1-pipeline";
-    private static final String PIPELINE_RRF_NAME = "nlp-hybrid-rrf-pipeline";
-    private static final String PIPELINE1_RRF_NAME = "nlp-hybrid-rrf-1-pipeline";
     private static final String SEARCH_PIPELINE_NAME = "nlp-search-pipeline";
     private static final String SEARCH_PIPELINE1_NAME = "nlp-search-1-pipeline";
-    private static final String SEARCH_PIPELINE_RRF_NAME = "nlp-search-rrf-pipeline";
-    private static final String SEARCH_PIPELINE1_RRF_NAME = "nlp-search-rrf-1-pipeline";
     private static final String TEST_FIELD = "passage_text";
     private static final String TEXT_1 = "Hello world";
     private static final String TEXT_2 = "Hi planet";
@@ -45,31 +41,17 @@ public class HybridSearchIT extends AbstractRestartUpgradeRestTestCase {
     // Create Text Embedding Processor, Ingestion Pipeline, add document and search pipeline with normalization processor
     // Validate process , pipeline and document count in restart-upgrade scenario
     public void testNormalizationProcessor_whenIndexWithMultipleShards_E2EFlow() throws Exception {
-        validateProcessor("processor/IndexMappingMultipleShard.json", PIPELINE_NAME, SEARCH_PIPELINE_NAME, false);
+        validateNormalizationProcessor("processor/IndexMappingMultipleShard.json", PIPELINE_NAME, SEARCH_PIPELINE_NAME);
     }
 
     // Test restart-upgrade normalization processor when index with single shard
     // Create Text Embedding Processor, Ingestion Pipeline, add document and search pipeline with normalization processor
     // Validate process , pipeline and document count in restart-upgrade scenario
     public void testNormalizationProcessor_whenIndexWithSingleShard_E2EFlow() throws Exception {
-        validateProcessor("processor/IndexMappingSingleShard.json", PIPELINE1_NAME, SEARCH_PIPELINE1_NAME, false);
+        validateNormalizationProcessor("processor/IndexMappingSingleShard.json", PIPELINE1_NAME, SEARCH_PIPELINE1_NAME);
     }
 
-    // Test restart-upgrade rrf processor when index with multiple shards
-    // Create Text Embedding Processor, Ingestion Pipeline, add document and search pipeline with rrf processor
-    // Validate process , pipeline and document count in restart-upgrade scenario
-    public void testRRFProcessor_whenIndexWithMultipleShards_E2EFlow() throws Exception {
-        validateProcessor("processor/IndexMappingMultipleShard.json", PIPELINE_RRF_NAME, SEARCH_PIPELINE_RRF_NAME, true);
-    }
-
-    // Test restart-upgrade rrf processor when index with single shard
-    // Create Text Embedding Processor, Ingestion Pipeline, add document and search pipeline with rrf processor
-    // Validate process , pipeline and document count in restart-upgrade scenario
-    public void testRRFProcessor_whenIndexWithSingleShard_E2EFlow() throws Exception {
-        validateProcessor("processor/IndexMappingSingleShard.json", PIPELINE1_RRF_NAME, SEARCH_PIPELINE1_RRF_NAME, true);
-    }
-
-    private void validateProcessor(final String fileName, final String pipelineName, final String searchPipelineName, boolean isRRF)
+    private void validateNormalizationProcessor(final String fileName, final String pipelineName, final String searchPipelineName)
         throws Exception {
         waitForClusterHealthGreen(NODES_BWC_CLUSTER);
         if (isRunningAgainstOldCluster()) {
@@ -82,11 +64,7 @@ private void validateProcessor(final String fileName, final String pipelineName,
                 pipelineName
             );
             addDocuments(getIndexNameForTest(), true);
-            if (isRRF) {
-                createRRFSearchPipeline(searchPipelineName);
-            } else {
-                createSearchPipeline(searchPipelineName);
-            }
+            createSearchPipeline(searchPipelineName);
         } else {
             String modelId = null;
             try {

diff --git a/src/test/java/org/opensearch/neuralsearch/processor/RRFProcessorIT.java b/src/test/java/org/opensearch/neuralsearch/processor/RRFProcessorIT.java
@@ -36,7 +36,7 @@ public void testRRF_whenValidInput_thenSucceed() {
                 Collections.singletonList(new KNNFieldConfig("passage_embedding", RRF_DIMENSION, TEST_SPACE_TYPE))
             );
             addDocuments();
-            createRRFSearchPipeline(RRF_SEARCH_PIPELINE);
+            createDefaultRRFSearchPipeline();
 
             HybridQueryBuilder hybridQueryBuilder = getHybridQueryBuilder();
 

diff --git a/src/testFixtures/java/org/opensearch/neuralsearch/BaseNeuralSearchIT.java b/src/testFixtures/java/org/opensearch/neuralsearch/BaseNeuralSearchIT.java
@@ -1444,7 +1444,7 @@ protected enum ProcessorType {
     }
 
     @SneakyThrows
-    protected void createRRFSearchPipeline(String pipelineName) {
+    protected void createDefaultRRFSearchPipeline() {
         String requestBody = XContentFactory.jsonBuilder()
             .startObject()
             .field("description", "Post processor for hybrid search")
@@ -1463,7 +1463,7 @@ protected void createRRFSearchPipeline(String pipelineName) {
         makeRequest(
             client(),
             "PUT",
-            String.format(LOCALE, "/_search/pipeline/%s", pipelineName),
+            String.format(LOCALE, "/_search/pipeline/%s", RRF_SEARCH_PIPELINE),
             null,
             toHttpEntity(String.format(LOCALE, requestBody)),
             ImmutableList.of(new BasicHeader(HttpHeaders.USER_AGENT, DEFAULT_USER_AGENT))