[Backport 2.x] Baseline owners and maintainers (#170) (#171)

* Baseline owners and maintainers (#170) Signed-off-by: Martin Gaievski <[email protected]> (cherry picked from commit d933b11) * Add allow_registering_model_via_url as integ test use custom model Signed-off-by: Martin Gaievski <[email protected]> * Add hash for test model Signed-off-by: Martin Gaievski <[email protected]> * Fix model deployment after recent redeploy feature in ml-commons Signed-off-by: Martin Gaievski <[email protected]> --------- Signed-off-by: Martin Gaievski <[email protected]>
opensearch-project · May 12, 2023 · acdb7f2 · acdb7f2
1 parent e8c732f
commit acdb7f2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/neural-search
+*   @heemin32 @navneet1v @VijayanB @vamshin @jmazanec15 @naveentatikonda @junqiu-lei @martin-gaievski @sean-zheng-amazon @model-collapse @wujunshen @zane-neo @ylwu-amzn @jngz-es
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -11,5 +11,8 @@
 | Zan Niu                | [zane-neo](https://github.com/zane-neo)                   | Amazon      |
 | Yaliang Wu             | [ylwu-amzn](https://github.com/ylwu-amzn)                 | Amazon      |
 | Jing Zhang             | [jngz-es](https://github.com/jngz-es)                     | Amazon      |
-
-[This document](https://github.com/opensearch-project/.github/blob/main/MAINTAINERS.md) explains what maintainers do in this repo, and how they should be doing it. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).
+| Heemin Kim             | [heemin32](https://github.com/heemin32)                   | Amazon      |
+| Junqiu Lei             | [junqiu-lei](https://github.com/junqiu-lei)               | Amazon      |
+| Martin Gaievski        | [martin-gaievski](https://github.com/martin-gaievski)     | Amazon      |
+| Naveen Tatikonda       | [naveentatikonda](https://github.com/naveentatikonda)     | Amazon      |
+| Vijayan Balasubramanian| [VijayanB](https://github.com/VijayanB)                   | Amazon      |
diff --git a/src/test/java/org/opensearch/neuralsearch/common/BaseNeuralSearchIT.java b/src/test/java/org/opensearch/neuralsearch/common/BaseNeuralSearchIT.java
@@ -64,6 +64,7 @@ public void setupSettings() {
         updateClusterSettings("plugins.ml_commons.only_run_on_ml_node", false);
         // default threshold for native circuit breaker is 90, it may be not enough on test runner machine
         updateClusterSettings("plugins.ml_commons.native_memory_threshold", 100);
+        updateClusterSettings("plugins.ml_commons.allow_registering_model_via_url", true);
     }
 
     @SneakyThrows
@@ -90,7 +91,7 @@ protected String uploadModel(String requestBody) throws Exception {
         Response uploadResponse = makeRequest(
             client(),
             "POST",
-            "/_plugins/_ml/models/_upload",
+            "/_plugins/_ml/models/_register",
             null,
             toHttpEntity(requestBody),
             ImmutableList.of(new BasicHeader(HttpHeaders.USER_AGENT, "Kibana"))

diff --git a/src/test/java/org/opensearch/neuralsearch/query/NeuralQueryIT.java b/src/test/java/org/opensearch/neuralsearch/query/NeuralQueryIT.java
@@ -45,9 +45,7 @@ public class NeuralQueryIT extends BaseNeuralSearchIT {
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        if (modelId.get() == null) {
-            modelId.compareAndSet(null, prepareModel());
-        }
+        modelId.compareAndSet(modelId.get(), prepareModel());
     }
 
     /**

diff --git a/src/test/resources/processor/UploadModelRequestBody.json b/src/test/resources/processor/UploadModelRequestBody.json
@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "model_format": "TORCH_SCRIPT",
   "model_task_type": "text_embedding",
+  "model_content_hash_value": "e13b74006290a9d0f58c1376f9629d4ebc05a0f9385f40db837452b167ae9021",
   "model_config": {
     "model_type": "bert",
     "embedding_dimension": 768,