From ecc9ea2f2c4c5aaffdcfbb7133fdd3fd113ac595 Mon Sep 17 00:00:00 2001 From: Dhrubo Saha Date: Thu, 9 Jan 2025 17:18:24 -0500 Subject: [PATCH 1/3] adding more log to debug the testVisualizationFound issue Signed-off-by: Dhrubo Saha --- .../opensearch/ml/tools/ToolIntegrationWithLLMTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugin/src/test/java/org/opensearch/ml/tools/ToolIntegrationWithLLMTest.java b/plugin/src/test/java/org/opensearch/ml/tools/ToolIntegrationWithLLMTest.java index a9b3f84bfc..904a7f086b 100644 --- a/plugin/src/test/java/org/opensearch/ml/tools/ToolIntegrationWithLLMTest.java +++ b/plugin/src/test/java/org/opensearch/ml/tools/ToolIntegrationWithLLMTest.java @@ -93,12 +93,14 @@ private void checkForModelUndeployedStatus(String modelId) { protected Response waitResponseMeetingCondition(String method, String endpoint, String jsonEntity, Predicate condition) { for (int attempt = 1; attempt <= MAX_RETRIES; attempt++) { Response response = TestHelper.makeRequest(client(), method, endpoint, null, jsonEntity, null); - assertEquals(RestStatus.OK, RestStatus.fromCode(response.getStatusLine().getStatusCode())); - if (condition.test(response)) { + RestStatus status = RestStatus.fromCode(response.getStatusLine().getStatusCode()); + assertEquals(RestStatus.OK, status); + logger.info("Attempt {}: Status: {}, Response: {}", attempt, status, response); + if (status == RestStatus.OK && condition.test(response)) { return response; } logger.info("The {}-th attempt on {}:{} . response: {}", attempt, method, endpoint, response.toString()); - Thread.sleep(DEFAULT_TASK_RESULT_QUERY_INTERVAL_IN_MILLISECOND); + Thread.sleep(DEFAULT_TASK_RESULT_QUERY_INTERVAL_IN_MILLISECOND * attempt); } fail( String From 382b4ec298e1dba8fa3771933acded877df281f6 Mon Sep 17 00:00:00 2001 From: Dhrubo Saha Date: Thu, 9 Jan 2025 19:26:26 -0500 Subject: [PATCH 2/3] changing back Signed-off-by: Dhrubo Saha --- .../opensearch/ml/tools/ToolIntegrationWithLLMTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/plugin/src/test/java/org/opensearch/ml/tools/ToolIntegrationWithLLMTest.java b/plugin/src/test/java/org/opensearch/ml/tools/ToolIntegrationWithLLMTest.java index 904a7f086b..a9b3f84bfc 100644 --- a/plugin/src/test/java/org/opensearch/ml/tools/ToolIntegrationWithLLMTest.java +++ b/plugin/src/test/java/org/opensearch/ml/tools/ToolIntegrationWithLLMTest.java @@ -93,14 +93,12 @@ private void checkForModelUndeployedStatus(String modelId) { protected Response waitResponseMeetingCondition(String method, String endpoint, String jsonEntity, Predicate condition) { for (int attempt = 1; attempt <= MAX_RETRIES; attempt++) { Response response = TestHelper.makeRequest(client(), method, endpoint, null, jsonEntity, null); - RestStatus status = RestStatus.fromCode(response.getStatusLine().getStatusCode()); - assertEquals(RestStatus.OK, status); - logger.info("Attempt {}: Status: {}, Response: {}", attempt, status, response); - if (status == RestStatus.OK && condition.test(response)) { + assertEquals(RestStatus.OK, RestStatus.fromCode(response.getStatusLine().getStatusCode())); + if (condition.test(response)) { return response; } logger.info("The {}-th attempt on {}:{} . response: {}", attempt, method, endpoint, response.toString()); - Thread.sleep(DEFAULT_TASK_RESULT_QUERY_INTERVAL_IN_MILLISECOND * attempt); + Thread.sleep(DEFAULT_TASK_RESULT_QUERY_INTERVAL_IN_MILLISECOND); } fail( String From 41cf3c52cd6e99b1adf0ae7e30b43512faef724d Mon Sep 17 00:00:00 2001 From: Dhrubo Saha Date: Fri, 10 Jan 2025 11:23:26 -0800 Subject: [PATCH 3/3] adding mingshi as maintainer Signed-off-by: Dhrubo Saha --- .github/CODEOWNERS | 2 +- MAINTAINERS.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 48151440d4..61eeccf9db 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @b4sjoo @dhrubo-os @jngz-es @model-collapse @rbhavna @ylwu-amzn @zane-neo @Zhangxunmt @austintlee @HenryL27 @samuel-oci @xinyual \ No newline at end of file +* @b4sjoo @dhrubo-os @mingshl @jngz-es @model-collapse @rbhavna @ylwu-amzn @zane-neo @Zhangxunmt @austintlee @HenryL27 @samuel-oci @xinyual \ No newline at end of file diff --git a/MAINTAINERS.md b/MAINTAINERS.md index fa90e299ef..c9c1d6ade8 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -12,6 +12,7 @@ This document contains a list of maintainers in this repo. See [opensearch-proje | Jing Zhang | [jngz-es](https://github.com/jngz-es) | Amazon | | Junshen Wu | [wujunshen](https://github.com/wujunshen) | Amazon | | Sicheng Song | [b4sjoo](https://github.com/b4sjoo) | Amazon | +| Mingshi Liu | [mingshl](https://github.com/mingshl) | Amazon | | Xinyuan Lu | [xinyual](https://github.com/xinyual) | Amazon | | Xun Zhang | [Zhangxunmt](https://github.com/Zhangxunmt) | Amazon | | Yaliang Wu | [ylwu-amzn](https://github.com/ylwu-amzn) | Amazon | @@ -24,5 +25,4 @@ This document contains a list of maintainers in this repo. See [opensearch-proje | Maintainer | GitHub ID | Affiliation | | ----------- | ------------------------------------------------- | ----------- | -| Jackie Han | [jackiehanyang](https://github.com/jackiehanyang) | Amazon | -| Mingshi Liu | [mingshl](https://github.com/mingshl) | Amazon | \ No newline at end of file +| Jackie Han | [jackiehanyang](https://github.com/jackiehanyang) | Amazon | \ No newline at end of file