make restart and upgrade base tests same

will-hwang · Jan 8, 2025 · c02b6d8 · c02b6d8
1 parent 3066082
commit c02b6d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/...upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java b/...upgrade/src/test/java/org/opensearch/neuralsearch/bwc/AbstractRollingUpgradeTestCase.java
@@ -80,7 +80,7 @@ protected final ClusterType getClusterType() {
     }
 
     protected final boolean isFirstMixedRound() {
-        return Boolean.parseBoolean(System.getProperty(ROLLING_UPGRADE_FIRST_ROUND, "false"));
+        return Boolean.parseBoolean(System.getProperty(ROLLING_UPGRADE_FIRST_ROUND));
     }
 
     protected final Optional<String> getBWCVersion() {
@@ -131,13 +131,13 @@ protected void createPipelineForSparseEncodingProcessor(String modelId, String p
         createPipelineProcessor(requestBody, pipelineName, modelId);
     }
 
-    @Override
-    protected void updateClusterSettings() {
-        updateClusterSettings("plugins.ml_commons.only_run_on_ml_node", false);
-        // default threshold for native circuit breaker is 90, it may be not enough on test runner machine
-        updateClusterSettings("plugins.ml_commons.native_memory_threshold", 100);
-        updateClusterSettings("plugins.ml_commons.allow_registering_model_via_url", true);
-    }
+//    @Override
+//    protected void updateClusterSettings() {
+//        updateClusterSettings("plugins.ml_commons.only_run_on_ml_node", false);
+//        // default threshold for native circuit breaker is 90, it may be not enough on test runner machine
+//        updateClusterSettings("plugins.ml_commons.native_memory_threshold", 100);
+//        updateClusterSettings("plugins.ml_commons.allow_registering_model_via_url", true);
+//    }
 
     protected void createPipelineForTextChunkingProcessor(String pipelineName) throws Exception {
         String requestBody = Files.readString(

diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/MultiModalSearchIT.java
@@ -32,14 +32,7 @@ public class MultiModalSearchIT extends AbstractRollingUpgradeTestCase {
     // Create Text Image Embedding Processor, Ingestion Pipeline and add document
     // Validate process , pipeline and document count in rolling-upgrade scenario
     public void testTextImageEmbeddingProcessor_E2EFlow() throws Exception {
-        int count = 0;
-        int maxCount = 3;
-        Response response;
-        do {
-            response = waitForClusterHealthGreen(NODES_BWC_CLUSTER);
-            count++;
-        } while (count < maxCount && response.getStatusLine().getStatusCode() == 200 );
-
+        waitForClusterHealthGreen(NODES_BWC_CLUSTER);
         switch (getClusterType()) {
             case OLD:
                 modelId = uploadTextImageEmbeddingModel();