From 66f6084f126683f7e66b604191b1b4bea1a0da2d Mon Sep 17 00:00:00 2001
From: Martin Gaievski <gaievski@amazon.com>
Date: Tue, 4 Jun 2024 09:18:36 -0700
Subject: [PATCH] Lower heap memory allocation for test cluster, disable CB for
 all tests (#770)

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
(cherry picked from commit 8705980399f99a9d657c3d96ffce0d1624af243c)
---
 CHANGELOG.md                                                 | 1 +
 build.gradle                                                 | 2 +-
 .../neuralsearch/processor/ScoreNormalizationIT.java         | 5 -----
 .../neuralsearch/query/HybridQueryAggregationsIT.java        | 5 -----
 .../org/opensearch/neuralsearch/query/HybridQueryIT.java     | 5 -----
 .../query/aggregation/BaseAggregationsWithHybridQueryIT.java | 5 -----
 6 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d7b9c65f..a9cd52ed4 100644
--- 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
index f59044db1..66b4ca53f 100644
--- 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
index 696aafb26..9f201b4bd 100644
--- 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
index 2a2fc7f34..9e72dfcb1 100644
--- 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
index f99710c51..43e302698 100644
--- 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/src/test/java/org/opensearch/neuralsearch/query/aggregation/BaseAggregationsWithHybridQueryIT.java b/src/test/java/org/opensearch/neuralsearch/query/aggregation/BaseAggregationsWithHybridQueryIT.java
index 521606fda..48fb8f8d6 100644
--- a/src/test/java/org/opensearch/neuralsearch/query/aggregation/BaseAggregationsWithHybridQueryIT.java
+++ b/src/test/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;