Fix Null Pointer Exception and Improve Handling for Missing Config Index

This PR addresses two issues to enhance robustness in the IndexManagement class: * Null Check for Candidate Result Aliases: * Added a null check for candidateResultAliases in updateCustomResultIndexMapping to prevent NullPointerExceptions. * Graceful Handling for Missing Config Index: * Modified searchConfigs to return an empty list instead of throwing a ResourceNotFoundException when the config index does not exist. Testing: * Verified that NullPointerExceptions are prevented and the system gracefully handles cases where the config index does not exist. Signed-off-by: Kaituo Li <[email protected]>
kaituo · Jun 10, 2024 · 78917a3 · 78917a3
1 parent 744a24f
commit 78917a3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/org/opensearch/timeseries/indices/IndexManagement.java b/src/main/java/org/opensearch/timeseries/indices/IndexManagement.java
@@ -77,7 +77,6 @@
 import org.opensearch.threadpool.Scheduler;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.timeseries.common.exception.EndRunException;
-import org.opensearch.timeseries.common.exception.ResourceNotFoundException;
 import org.opensearch.timeseries.common.exception.TimeSeriesException;
 import org.opensearch.timeseries.constant.CommonMessages;
 import org.opensearch.timeseries.constant.CommonName;
@@ -747,7 +746,7 @@ private void updateMappingIfNecessary(GroupedActionListener<Void> delegateListen
 
     private void updateCustomResultIndexMapping(IndexType customIndex, GroupedActionListener<Void> delegateListeneer) {
         getConfigsWithCustomResultIndexAlias(ActionListener.wrap(candidateResultAliases -> {
-            if (candidateResultAliases.size() == 0) {
+            if (candidateResultAliases == null || candidateResultAliases.size() == 0) {
                 logger.info("candidate custom result indices are empty.");
                 markMappingUpdated(customIndex);
                 delegateListeneer.onResponse(null);
@@ -784,7 +783,7 @@ private void getConfigsWithCustomResultIndexAlias(ActionListener<List<Config>> l
             }
         }
         if (configIndex == null || configIndex.getIndexName() == null) {
-            listener.onFailure(new ResourceNotFoundException("fail to find config index"));
+            listener.onResponse(new ArrayList<Config>());
             return;
         }
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
@@ -800,7 +799,7 @@ private void getConfigsWithCustomResultIndexAlias(ActionListener<List<Config>> l
         client.search(searchRequest, ActionListener.wrap(r -> {
             if (r == null || r.getHits().getTotalHits() == null || r.getHits().getTotalHits().value == 0) {
                 logger.info("no config available.");
-                listener.onResponse(null);
+                listener.onResponse(new ArrayList<Config>());
                 return;
             }
             Iterator<SearchHit> iterator = r.getHits().iterator();