Skip to content

Commit 8705980

Browse files
Lower heap memory allocation for test cluster, disable CB for all tests (#770)
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
1 parent 2b21110 commit 8705980

File tree

6 files changed

+2
-21
lines changed

6 files changed

+2
-21
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2424
### Bug Fixes
2525
- Total hit count fix in Hybrid Query ([756](https://github.com/opensearch-project/neural-search/pull/756))
2626
### Infrastructure
27+
- Disable memory circuit breaker for integ tests ([#770](https://github.com/opensearch-project/neural-search/pull/770))
2728
### Documentation
2829
### Maintenance
2930
### Refactoring

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ testClusters.integTest {
396396

397397
// Increase heap size from default of 512mb to 1gb. When heap size is 512mb, our integ tests sporadically fail due
398398
// to ml-commons memory circuit breaker exception
399-
jvmArgs("-Xms1g", "-Xmx4g")
399+
jvmArgs("-Xms1g", "-Xmx2g")
400400
}
401401

402402
// Remote Integration Tests

src/test/java/org/opensearch/neuralsearch/processor/ScoreNormalizationIT.java

-5
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ public void setUp() throws Exception {
5252
updateClusterSettings();
5353
}
5454

55-
@Override
56-
public boolean isUpdateClusterSettings() {
57-
return false;
58-
}
59-
6055
/**
6156
* Using search pipelines with config for l2 norm:
6257
* {

src/test/java/org/opensearch/neuralsearch/query/HybridQueryAggregationsIT.java

-5
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ public void setUp() throws Exception {
9393
updateClusterSettings();
9494
}
9595

96-
@Override
97-
public boolean isUpdateClusterSettings() {
98-
return false;
99-
}
100-
10196
@Override
10297
protected boolean preserveClusterUponCompletion() {
10398
return true;

src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java

-5
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ public void setUp() throws Exception {
8787
updateClusterSettings();
8888
}
8989

90-
@Override
91-
public boolean isUpdateClusterSettings() {
92-
return false;
93-
}
94-
9590
@Override
9691
protected boolean preserveClusterUponCompletion() {
9792
return true;

src/test/java/org/opensearch/neuralsearch/query/aggregation/BaseAggregationsWithHybridQueryIT.java

-5
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ public static void setUpCluster() {
8989
instance.updateClusterSettings();
9090
}
9191

92-
@Override
93-
public boolean isUpdateClusterSettings() {
94-
return false;
95-
}
96-
9792
@Override
9893
protected boolean preserveClusterUponCompletion() {
9994
return true;

0 commit comments

Comments
 (0)