Lower heap memory allocation for test cluster, disable CB for all tes…

…ts (#770) Signed-off-by: Martin Gaievski <[email protected]> (cherry picked from commit 8705980)
opensearch-project · Jun 4, 2024 · 66f6084 · 66f6084
1 parent 279d934
commit 66f6084
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Bug Fixes
 - Total hit count fix in Hybrid Query ([756](https://github.com/opensearch-project/neural-search/pull/756))
 ### Infrastructure
+- Disable memory circuit breaker for integ tests ([#770](https://github.com/opensearch-project/neural-search/pull/770))
 ### Documentation
 ### Maintenance
 ### Refactoring
diff --git a/build.gradle b/build.gradle
@@ -396,7 +396,7 @@ testClusters.integTest {
 
     // Increase heap size from default of 512mb to 1gb. When heap size is 512mb, our integ tests sporadically fail due
     // to ml-commons memory circuit breaker exception
-    jvmArgs("-Xms1g", "-Xmx4g")
+    jvmArgs("-Xms1g", "-Xmx2g")
 }
 
 // Remote Integration Tests

diff --git a/src/test/java/org/opensearch/neuralsearch/processor/ScoreNormalizationIT.java b/src/test/java/org/opensearch/neuralsearch/processor/ScoreNormalizationIT.java
@@ -52,11 +52,6 @@ public void setUp() throws Exception {
         updateClusterSettings();
     }
 
-    @Override
-    public boolean isUpdateClusterSettings() {
-        return false;
-    }
-
     /**
      * Using search pipelines with config for l2 norm:
      * {

diff --git a/src/test/java/org/opensearch/neuralsearch/query/HybridQueryAggregationsIT.java b/src/test/java/org/opensearch/neuralsearch/query/HybridQueryAggregationsIT.java
@@ -93,11 +93,6 @@ public void setUp() throws Exception {
         updateClusterSettings();
     }
 
-    @Override
-    public boolean isUpdateClusterSettings() {
-        return false;
-    }
-
     @Override
     protected boolean preserveClusterUponCompletion() {
         return true;

diff --git a/src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java b/src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java
@@ -87,11 +87,6 @@ public void setUp() throws Exception {
         updateClusterSettings();
     }
 
-    @Override
-    public boolean isUpdateClusterSettings() {
-        return false;
-    }
-
     @Override
     protected boolean preserveClusterUponCompletion() {
         return true;

diff --git a/...java/org/opensearch/neuralsearch/query/aggregation/BaseAggregationsWithHybridQueryIT.java b/...java/org/opensearch/neuralsearch/query/aggregation/BaseAggregationsWithHybridQueryIT.java
@@ -89,11 +89,6 @@ public static void setUpCluster() {
         instance.updateClusterSettings();
     }
 
-    @Override
-    public boolean isUpdateClusterSettings() {
-        return false;
-    }
-
     @Override
     protected boolean preserveClusterUponCompletion() {
         return true;