Address comment from Peng

Signed-off-by: Louis Chu <[email protected]>
opensearch-project · Feb 20, 2024 · 0b56cf9 · 0b56cf9
1 parent efda5f2
commit 0b56cf9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/flint-core/src/main/scala/org/opensearch/flint/core/storage/OpenSearchQueryReader.java b/flint-core/src/main/scala/org/opensearch/flint/core/storage/OpenSearchQueryReader.java
@@ -23,6 +23,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import static org.opensearch.flint.core.metrics.MetricConstants.REQUEST_METADATA_READ_METRIC_PREFIX;
+
 /**
  * {@link OpenSearchReader} using search. https://opensearch.org/docs/latest/api-reference/search/
  */
@@ -37,10 +39,18 @@ public OpenSearchQueryReader(IRestHighLevelClient client, String indexName, Sear
   /**
    * search.
    */
-  Optional<SearchResponse> search(SearchRequest request) throws IOException {
-   return Optional.of(client.search(request, RequestOptions.DEFAULT));
+  Optional<SearchResponse> search(SearchRequest request) {
+    Optional<SearchResponse> response = Optional.empty();
+    try {
+      response = Optional.of(client.search(request, RequestOptions.DEFAULT));
+      IRestHighLevelClient.recordOperationSuccess(REQUEST_METADATA_READ_METRIC_PREFIX);
+    } catch (Exception e) {
+      IRestHighLevelClient.recordOperationFailure(REQUEST_METADATA_READ_METRIC_PREFIX, e);
+    }
+    return response;
   }
 
+
   /**
    * nothing to clean
    */

diff --git a/flint-core/src/main/scala/org/opensearch/flint/core/storage/OpenSearchReader.java b/flint-core/src/main/scala/org/opensearch/flint/core/storage/OpenSearchReader.java
@@ -17,8 +17,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import static org.opensearch.flint.core.metrics.MetricConstants.REQUEST_METADATA_READ_METRIC_PREFIX;
-
 /**
  * Abstract OpenSearch Reader.
  */
@@ -43,7 +41,6 @@ public OpenSearchReader(IRestHighLevelClient client, SearchRequest searchRequest
     try {
       if (iterator == null || !iterator.hasNext()) {
         Optional<SearchResponse> response = search(searchRequest);
-        IRestHighLevelClient.recordOperationSuccess(REQUEST_METADATA_READ_METRIC_PREFIX);
         if (response.isEmpty()) {
           iterator = null;
           return false;
@@ -53,7 +50,6 @@ public OpenSearchReader(IRestHighLevelClient client, SearchRequest searchRequest
       }
       return iterator.hasNext();
     } catch (OpenSearchStatusException e) {
-      IRestHighLevelClient.recordOperationFailure(REQUEST_METADATA_READ_METRIC_PREFIX, e);
       //  e.g., org.opensearch.OpenSearchStatusException: OpenSearch exception [type=index_not_found_exception, reason=no such index [query_results2]]
       if (e.getMessage() != null && (e.getMessage().contains("index_not_found_exception"))) {
         return false;