fix ignoreFailure flag (#3564) (#3570)

Signed-off-by: Mingshi Liu <[email protected]> (cherry picked from commit 009a345) Co-authored-by: Mingshi Liu <[email protected]>
opensearch-project · Feb 20, 2025 · 9ab3d88 · 9ab3d88
1 parent 19a845b
commit 9ab3d88
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/plugin/src/main/java/org/opensearch/ml/processor/MLInferenceSearchRequestProcessor.java b/plugin/src/main/java/org/opensearch/ml/processor/MLInferenceSearchRequestProcessor.java
@@ -597,9 +597,6 @@ public MLInferenceSearchRequestProcessor create(
             boolean fullResponsePath = ConfigurationUtils
                 .readBooleanProperty(TYPE, processorTag, config, FULL_RESPONSE_PATH, defaultFullResponsePath);
 
-            ignoreFailure = ConfigurationUtils
-                .readBooleanProperty(TYPE, processorTag, config, ConfigurationUtils.IGNORE_FAILURE_KEY, false);
-
             // convert model config user input data structure to Map<String, String>
             Map<String, String> modelConfigMaps = null;
             if (modelConfigInput != null) {

diff --git a/plugin/src/main/java/org/opensearch/ml/processor/MLInferenceSearchResponseProcessor.java b/plugin/src/main/java/org/opensearch/ml/processor/MLInferenceSearchResponseProcessor.java
@@ -840,9 +840,6 @@ public MLInferenceSearchResponseProcessor create(
             boolean fullResponsePath = ConfigurationUtils
                 .readBooleanProperty(TYPE, processorTag, config, FULL_RESPONSE_PATH, defaultFullResponsePath);
 
-            ignoreFailure = ConfigurationUtils
-                .readBooleanProperty(TYPE, processorTag, config, ConfigurationUtils.IGNORE_FAILURE_KEY, false);
-
             // convert model config user input data structure to Map<String, String>
             Map<String, String> modelConfigMaps = null;
             if (modelConfigInput != null) {

diff --git a/plugin/src/test/java/org/opensearch/ml/processor/MLInferenceSearchRequestProcessorTests.java b/plugin/src/test/java/org/opensearch/ml/processor/MLInferenceSearchRequestProcessorTests.java
@@ -706,7 +706,7 @@ public void onFailure(Exception ex) {
         };
 
         requestProcessor.processRequestAsync(request, requestContext, listener);
-
+        assertEquals(requestProcessor.isIgnoreFailure(), true);
     }
 
     /**
@@ -749,7 +749,7 @@ public void onFailure(Exception ex) {
         };
 
         requestProcessor.processRequestAsync(request, requestContext, Listener);
-
+        assertEquals(requestProcessor.isIgnoreFailure(), false);
     }
 
     /**
@@ -788,7 +788,7 @@ public void onFailure(Exception ex) {
         };
 
         requestProcessor.processRequestAsync(request, requestContext, Listener);
-
+        assertEquals(requestProcessor.isIgnoreFailure(), true);
     }
 
     /**
@@ -851,7 +851,7 @@ public void onFailure(Exception e) {
         };
 
         requestProcessor.processRequestAsync(request, requestContext, Listener);
-
+        assertEquals(requestProcessor.isIgnoreFailure(), false);
     }
 
     /**
@@ -998,7 +998,7 @@ public void onFailure(Exception ex) {
             }
         };
         requestProcessor.processRequestAsync(request, requestContext, Listener);
-
+        assertEquals(requestProcessor.isIgnoreFailure(), true);
     }
 
     /**
@@ -1444,6 +1444,7 @@ public void testCreateRequiredFields() throws Exception {
         assertNotNull(MLInferenceSearchRequestProcessor);
         assertEquals(MLInferenceSearchRequestProcessor.getTag(), processorTag);
         assertEquals(MLInferenceSearchRequestProcessor.getType(), MLInferenceSearchRequestProcessor.TYPE);
+        assertEquals(MLInferenceSearchRequestProcessor.isIgnoreFailure(), false);
     }
 
     /**
@@ -1478,6 +1479,7 @@ public void testCreateLocalModelProcessor() throws Exception {
         assertNotNull(MLInferenceSearchRequestProcessor);
         assertEquals(MLInferenceSearchRequestProcessor.getTag(), processorTag);
         assertEquals(MLInferenceSearchRequestProcessor.getType(), MLInferenceSearchRequestProcessor.TYPE);
+        assertEquals(MLInferenceSearchRequestProcessor.isIgnoreFailure(), false);
     }
 
     /**
@@ -1675,9 +1677,11 @@ public void testCreateOptionalFields() throws Exception {
         String processorTag = randomAlphaOfLength(10);
 
         MLInferenceSearchRequestProcessor MLInferenceSearchRequestProcessor = factory
-            .create(Collections.emptyMap(), processorTag, null, false, config, null);
+            .create(Collections.emptyMap(), processorTag, "test", true, config, null);
         assertNotNull(MLInferenceSearchRequestProcessor);
         assertEquals(MLInferenceSearchRequestProcessor.getTag(), processorTag);
         assertEquals(MLInferenceSearchRequestProcessor.getType(), MLInferenceSearchRequestProcessor.TYPE);
+        assertEquals(MLInferenceSearchRequestProcessor.isIgnoreFailure(), true);
+        assertEquals(MLInferenceSearchRequestProcessor.getDescription(), "test");
     }
 }
diff --git a/...in/src/test/java/org/opensearch/ml/processor/MLInferenceSearchResponseProcessorTests.java b/...in/src/test/java/org/opensearch/ml/processor/MLInferenceSearchResponseProcessorTests.java
@@ -1449,6 +1449,7 @@ public void onFailure(Exception e) {
         };
         responseProcessor.processResponseAsync(request, response, responseContext, listener);
         verify(client, times(1)).execute(any(), any(), any());
+        assertEquals(responseProcessor.isIgnoreFailure(), true);
     }
 
     /**
@@ -1540,6 +1541,7 @@ public void onFailure(Exception e) {
         };
         responseProcessor.processResponseAsync(request, mockResponse, responseContext, listener);
         verify(client, times(1)).execute(any(), any(), any());
+        assertEquals(responseProcessor.isIgnoreFailure(), true);
     }
 
     /**
@@ -1923,6 +1925,7 @@ public void onFailure(Exception e) {
         };
         responseProcessor.processResponseAsync(request, response, responseContext, listener);
         verify(client, times(1)).execute(any(), any(), any());
+        assertEquals(responseProcessor.isIgnoreFailure(), true);
     }
 
     /**
@@ -2104,6 +2107,7 @@ public void onFailure(Exception e) {
         };
         responseProcessor.processResponseAsync(request, response, responseContext, listener);
         verify(client, times(5)).execute(any(), any(), any());
+        assertEquals(responseProcessor.isIgnoreFailure(), true);
     }
 
     /**
@@ -2542,6 +2546,7 @@ public void onFailure(Exception e) {
         };
         responseProcessor.processResponseAsync(request, response, responseContext, listener);
         verify(client, times(0)).execute(any(), any(), any());
+        assertEquals(responseProcessor.isIgnoreFailure(), true);
     }
 
     /**
@@ -3466,6 +3471,7 @@ public void onFailure(Exception e) {
         };
 
         responseProcessor.processResponseAsync(request, response, responseContext, listener);
+        assertEquals(responseProcessor.isIgnoreFailure(), true);
     }
 
     /**
@@ -3691,6 +3697,7 @@ public void onFailure(Exception e) {
         when(mockResponse.getAggregations()).thenThrow(mockException);
 
         responseProcessor.processResponseAsync(request, mockResponse, responseContext, listener);
+        assertEquals(responseProcessor.isIgnoreFailure(), true);
     }
 
     /**
@@ -4310,6 +4317,7 @@ public void testCreateRequiredFields() throws Exception {
         assertNotNull(MLInferenceSearchResponseProcessor);
         assertEquals(MLInferenceSearchResponseProcessor.getTag(), processorTag);
         assertEquals(MLInferenceSearchResponseProcessor.getType(), MLInferenceSearchResponseProcessor.TYPE);
+        assertEquals(MLInferenceSearchResponseProcessor.isIgnoreFailure(), false);
     }
 
     /**
@@ -4343,6 +4351,7 @@ public void testCreateLocalModelProcessor() throws Exception {
         assertNotNull(MLInferenceSearchResponseProcessor);
         assertEquals(MLInferenceSearchResponseProcessor.getTag(), processorTag);
         assertEquals(MLInferenceSearchResponseProcessor.getType(), MLInferenceSearchResponseProcessor.TYPE);
+        assertEquals(MLInferenceSearchResponseProcessor.isIgnoreFailure(), false);
     }
 
     /**
@@ -4501,10 +4510,12 @@ public void testCreateOptionalFields() throws Exception {
         String processorTag = randomAlphaOfLength(10);
 
         MLInferenceSearchResponseProcessor MLInferenceSearchResponseProcessor = factory
-            .create(Collections.emptyMap(), processorTag, null, false, config, null);
+            .create(Collections.emptyMap(), processorTag, "test", true, config, null);
         assertNotNull(MLInferenceSearchResponseProcessor);
         assertEquals(MLInferenceSearchResponseProcessor.getTag(), processorTag);
         assertEquals(MLInferenceSearchResponseProcessor.getType(), MLInferenceSearchResponseProcessor.TYPE);
+        assertEquals(MLInferenceSearchResponseProcessor.isIgnoreFailure(), true);
+        assertEquals(MLInferenceSearchResponseProcessor.getDescription(), "test");
     }
 
     /**