Reverting timeout increase, setting ML Commons native memory threshol…

…d to 100 to avoid opening circuit breaker Signed-off-by: Joshua Palis <[email protected]>
opensearch-project · Jan 3, 2024 · fbb5411 · fbb5411
1 parent f840e21
commit fbb5411
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java b/src/test/java/org/opensearch/flowframework/FlowFrameworkRestTestCase.java
@@ -119,6 +119,17 @@ public void setUpSettings() throws Exception {
             );
             assertEquals(200, response.getStatusLine().getStatusCode());
 
+            // Set ML native memory threshold to 100 to avoid opening the circuit breaker during tests
+            response = TestHelpers.makeRequest(
+                client(),
+                "PUT",
+                "_cluster/settings",
+                null,
+                "{\"persistent\":{\"plugins.ml_commons.native_memory_threshold\":100}}",
+                List.of(new BasicHeader(HttpHeaders.USER_AGENT, ""))
+            );
+            assertEquals(200, response.getStatusLine().getStatusCode());
+
             // Ensure .plugins-ml-config is created before proceeding with integration tests
             assertBusy(() -> { assertTrue(indexExistsWithAdminClient(".plugins-ml-config")); }, 30, TimeUnit.SECONDS);
         }

diff --git a/src/test/resources/template/registerlocalmodel-deploymodel.json b/src/test/resources/template/registerlocalmodel-deploymodel.json
@@ -16,7 +16,7 @@
           "id": "workflow_step_1",
           "type": "register_local_model",
           "user_inputs": {
-            "node_timeout": "100s",
+            "node_timeout": "60s",
             "name": "all-MiniLM-L6-v2",
             "version": "1.0.0",
             "description": "test model",
@@ -33,7 +33,7 @@
           "id": "workflow_step_2",
           "type": "deploy_model",
           "user_inputs": {
-            "node_timeout": "100s"
+            "node_timeout": "60s"
           },
           "previous_node_inputs": {
             "workflow_step_1": "model_id"