From 5e22b8b1d4e79e15b4add8df5cd343e9877d30b4 Mon Sep 17 00:00:00 2001 From: Nathalie Jonathan <143617992+nathaliellenaa@users.noreply.github.com> Date: Tue, 14 Jan 2025 08:03:16 -0800 Subject: [PATCH] Replaced native memory threshold settings with JVM heap memory threshold. (#788) Signed-off-by: Nathalie Jonathan --- CHANGELOG.md | 2 +- tests/plugins/ml/ml/controller/create.yaml | 2 +- tests/plugins/ml/ml/controller/delete.yaml | 2 +- tests/plugins/ml/ml/controller/get.yaml | 2 +- tests/plugins/ml/ml/controller/update.yaml | 2 +- tests/plugins/ml/ml/models/load.yaml | 2 +- tests/plugins/ml/ml/models/predict.yaml | 2 +- tests/plugins/ml/ml/models/search.yaml | 2 +- tests/plugins/ml/ml/models/undeploy.yaml | 2 +- tests/plugins/ml/ml/models/unload.yaml | 2 +- tests/plugins/ml/ml/models/upload.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b544ed78..6cb9a87f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -97,7 +97,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Fixed ingest API schemas ([#766](https://github.com/opensearch-project/opensearch-api-specification/pull/766)) - Fixed CAT API schemas ([#769](https://github.com/opensearch-project/opensearch-api-specification/pull/769)) - Fixed core API schemas ([#777](https://github.com/opensearch-project/opensearch-api-specification/pull/777)) -- Fixed Memory Circuit Breaker flaky test in ML Model APIs ([#782](https://github.com/opensearch-project/opensearch-api-specification/pull/782)) +- Fixed Memory Circuit Breaker flaky error in ML APIs ([#788](https://github.com/opensearch-project/opensearch-api-specification/pull/788)) ### Changed - Changed `tasks._common:TaskInfo` and `tasks._common:TaskGroup` to be composed of a `tasks._common:TaskInfoBase` ([#683](https://github.com/opensearch-project/opensearch-api-specification/pull/683)) diff --git a/tests/plugins/ml/ml/controller/create.yaml b/tests/plugins/ml/ml/controller/create.yaml index 40f7fcb8c..2ebf5cb4a 100644 --- a/tests/plugins/ml/ml/controller/create.yaml +++ b/tests/plugins/ml/ml/controller/create.yaml @@ -8,7 +8,7 @@ prologues: request: payload: persistent: - plugins.ml_commons.native_memory_threshold: 100 + plugins.ml_commons.jvm_heap_memory_threshold: 100 - path: /_plugins/_ml/models/_register id: register_model method: POST diff --git a/tests/plugins/ml/ml/controller/delete.yaml b/tests/plugins/ml/ml/controller/delete.yaml index 6187e5cf4..5b30b34ec 100644 --- a/tests/plugins/ml/ml/controller/delete.yaml +++ b/tests/plugins/ml/ml/controller/delete.yaml @@ -8,7 +8,7 @@ prologues: request: payload: persistent: - plugins.ml_commons.native_memory_threshold: 100 + plugins.ml_commons.jvm_heap_memory_threshold: 100 - path: /_plugins/_ml/models/_register id: register_model method: POST diff --git a/tests/plugins/ml/ml/controller/get.yaml b/tests/plugins/ml/ml/controller/get.yaml index 3ea9d8819..e501f6f6f 100644 --- a/tests/plugins/ml/ml/controller/get.yaml +++ b/tests/plugins/ml/ml/controller/get.yaml @@ -8,7 +8,7 @@ prologues: request: payload: persistent: - plugins.ml_commons.native_memory_threshold: 100 + plugins.ml_commons.jvm_heap_memory_threshold: 100 - path: /_plugins/_ml/models/_register id: register_model method: POST diff --git a/tests/plugins/ml/ml/controller/update.yaml b/tests/plugins/ml/ml/controller/update.yaml index 557ca8138..15f8facb6 100644 --- a/tests/plugins/ml/ml/controller/update.yaml +++ b/tests/plugins/ml/ml/controller/update.yaml @@ -8,7 +8,7 @@ prologues: request: payload: persistent: - plugins.ml_commons.native_memory_threshold: 100 + plugins.ml_commons.jvm_heap_memory_threshold: 100 - path: /_plugins/_ml/models/_register id: register_model method: POST diff --git a/tests/plugins/ml/ml/models/load.yaml b/tests/plugins/ml/ml/models/load.yaml index c6b012d9a..9b721e7ac 100644 --- a/tests/plugins/ml/ml/models/load.yaml +++ b/tests/plugins/ml/ml/models/load.yaml @@ -7,7 +7,7 @@ prologues: request: payload: persistent: - plugins.ml_commons.native_memory_threshold: 100 + plugins.ml_commons.jvm_heap_memory_threshold: 100 - path: /_plugins/_ml/models/_register id: register_model method: POST diff --git a/tests/plugins/ml/ml/models/predict.yaml b/tests/plugins/ml/ml/models/predict.yaml index 3ee099fc8..04ed9a65d 100644 --- a/tests/plugins/ml/ml/models/predict.yaml +++ b/tests/plugins/ml/ml/models/predict.yaml @@ -10,7 +10,7 @@ prologues: persistent: plugins.ml_commons.only_run_on_ml_node: false plugins.ml_commons.model_access_control_enabled: true - plugins.ml_commons.native_memory_threshold: 100 + plugins.ml_commons.jvm_heap_memory_threshold: 100 - path: /_plugins/_ml/model_groups/_register id: create_model_group method: POST diff --git a/tests/plugins/ml/ml/models/search.yaml b/tests/plugins/ml/ml/models/search.yaml index 2a04e2210..a778258b1 100644 --- a/tests/plugins/ml/ml/models/search.yaml +++ b/tests/plugins/ml/ml/models/search.yaml @@ -8,7 +8,7 @@ prologues: request: payload: persistent: - plugins.ml_commons.native_memory_threshold: 100 + plugins.ml_commons.jvm_heap_memory_threshold: 100 - path: /_plugins/_ml/models/_register id: register_model method: POST diff --git a/tests/plugins/ml/ml/models/undeploy.yaml b/tests/plugins/ml/ml/models/undeploy.yaml index 47d8d5c75..6189da3f6 100644 --- a/tests/plugins/ml/ml/models/undeploy.yaml +++ b/tests/plugins/ml/ml/models/undeploy.yaml @@ -9,7 +9,7 @@ prologues: payload: persistent: plugins.ml_commons.allow_custom_deployment_plan: true - plugins.ml_commons.native_memory_threshold: 100 + plugins.ml_commons.jvm_heap_memory_threshold: 100 - path: /_plugins/_ml/models/_register id: register_model method: POST diff --git a/tests/plugins/ml/ml/models/unload.yaml b/tests/plugins/ml/ml/models/unload.yaml index e1b6af576..b32346434 100644 --- a/tests/plugins/ml/ml/models/unload.yaml +++ b/tests/plugins/ml/ml/models/unload.yaml @@ -8,7 +8,7 @@ prologues: payload: persistent: plugins.ml_commons.allow_custom_deployment_plan: true - plugins.ml_commons.native_memory_threshold: 100 + plugins.ml_commons.jvm_heap_memory_threshold: 100 - path: /_plugins/_ml/models/_register id: register_model method: POST diff --git a/tests/plugins/ml/ml/models/upload.yaml b/tests/plugins/ml/ml/models/upload.yaml index c77ec5bc6..de1f9606b 100644 --- a/tests/plugins/ml/ml/models/upload.yaml +++ b/tests/plugins/ml/ml/models/upload.yaml @@ -7,7 +7,7 @@ prologues: request: payload: persistent: - plugins.ml_commons.native_memory_threshold: 100 + plugins.ml_commons.jvm_heap_memory_threshold: 100 epilogues: - path: /_plugins/_ml/tasks/{task_id} id: get_completed_task