From 87367cb810670c7cb3673a7c645e27e192cdfc36 Mon Sep 17 00:00:00 2001 From: John Mazanec Date: Tue, 4 Apr 2023 12:49:32 -0700 Subject: [PATCH] Fix delete training model cleanup in bwc Signed-off-by: John Mazanec --- .../src/test/java/org/opensearch/knn/bwc/ModelIT.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/knn/bwc/ModelIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/knn/bwc/ModelIT.java index 41ae494071..0e72adffa7 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/knn/bwc/ModelIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/knn/bwc/ModelIT.java @@ -21,14 +21,12 @@ import org.opensearch.knn.indices.ModelMetadata; import org.opensearch.knn.indices.ModelState; import org.opensearch.knn.plugin.KNNPlugin; -import org.opensearch.knn.plugin.transport.DeleteModelResponse; import org.opensearch.rest.RestStatus; import org.opensearch.search.SearchHit; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import java.util.Locale; import java.util.Map; import static org.opensearch.knn.TestUtils.KNN_BWC_PREFIX; @@ -156,6 +154,10 @@ public void testDeleteTrainingModel() throws Exception { ResponseException ex = expectThrows(ResponseException.class, () -> client().performRequest(request)); assertEquals(RestStatus.CONFLICT.getStatus(), ex.getResponse().getStatusLine().getStatusCode()); + + Request deleteModeFromIndexRequest = new Request("DELETE", String.join("/", MODEL_INDEX_NAME, "_doc", TEST_MODEL_ID_TRAINING)); + Response r = client().performRequest(deleteModeFromIndexRequest); + assertEquals(RestStatus.OK.getStatus(), r.getStatusLine().getStatusCode()); } } @@ -165,7 +167,6 @@ public static void wipeAllModels() throws IOException { if (!isRunningAgainstOldCluster()) { deleteKNNModel(TEST_MODEL_ID); deleteKNNModel(TEST_MODEL_ID_DEFAULT); - deleteKNNModel(TEST_MODEL_ID_TRAINING); Request request = new Request("DELETE", "/" + MODEL_INDEX_NAME);