Handle index not found error (#273)

opendistro-for-elasticsearch · Aug 28, 2020 · 87e5c71 · 87e5c71
1 parent 31ec0aa
commit 87e5c71
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/server/routes/ad.ts b/server/routes/ad.ts
@@ -47,6 +47,7 @@ import {
   getFinalDetectorStates,
   getDetectorsWithJob,
   getDetectorInitProgress,
+  isIndexNotFoundError,
 } from './utils/adHelpers';
 import { set } from 'lodash';
 
@@ -303,13 +304,10 @@ const searchDetector = async (
       },
     };
   } catch (err) {
-    if (
-      err.statusCode === 404 &&
-      get<string>(err, 'body.error.type', '') === 'index_not_found_exception'
-    ) {
+    console.log('Anomaly detector - Unable to search detectors', err);
+    if (isIndexNotFoundError(err)) {
       return { ok: true, response: { totalDetectors: 0, detectors: [] } };
     }
-    console.log('Anomaly detector - Unable to search detectors', err);
     return { ok: false, error: err.message };
   }
 };
@@ -515,7 +513,10 @@ const getDetectors = async (
       },
     };
   } catch (err) {
-    console.log('Anomaly detector - Unable to list detectors', err);
+    console.log('Anomaly detector - Unable to search detectors', err);
+    if (isIndexNotFoundError(err)) {
+      return { ok: true, response: { totalDetectors: 0, detectorList: [] } };
+    }
     return { ok: false, error: err.message };
   }
 };

diff --git a/server/routes/utils/adHelpers.ts b/server/routes/utils/adHelpers.ts
@@ -238,3 +238,10 @@ export const getDetectorsWithJob = (
 
   return resultDetectorWithJobs;
 };
+
+export const isIndexNotFoundError = (err: any) => {
+  return (
+    err.statusCode === 404 &&
+    get<string>(err, 'body.error.type', '') === 'index_not_found_exception'
+  );
+};