Use GET /_tasks/<task_id> instead of direct access to system index

Signed-off-by: Craig Perkins <[email protected]>
opensearch-project · Nov 1, 2024 · 6e21e8d · 6e21e8d
1 parent 14fafe6
commit 6e21e8d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 27 deletions.
diff --git a/public/JobHandler/callbacks/force_merge.tsx b/public/JobHandler/callbacks/force_merge.tsx
@@ -30,14 +30,14 @@ export const callbackForForceMerge: CallbackType = async (job: ForceMergeJobMeta
   const tasksResult = await commonService.apiCaller<ForceMergeTaskResult>({
     endpoint: "transport.request",
     data: {
-      path: `/.tasks/_doc/${extras.taskId}`,
+      path: `/_tasks/${extras.taskId}`,
       method: "GET",
     },
   });
   if (tasksResult.ok) {
-    const { _source, found } = tasksResult.response;
-    const { completed, error } = (_source || {}) as ForceMergeTaskResult["_source"];
-    if (completed && found) {
+    const _source = tasksResult.response;
+    const { completed, error } = (_source || {}) as ForceMergeTaskResult;
+    if (completed) {
       if (extras.toastId) {
         core.notifications.toasts.remove(extras.toastId);
       }

diff --git a/public/JobHandler/callbacks/open.tsx b/public/JobHandler/callbacks/open.tsx
@@ -22,13 +22,13 @@ export const callbackForOpen: CallbackType = async (job: OpenJobMetaData, { core
   const tasksResult = await commonService.apiCaller<OpenTaskResult>({
     endpoint: "transport.request",
     data: {
-      path: `/.tasks/_doc/${extras.taskId}`,
+      path: `/_tasks/${extras.taskId}`,
       method: "GET",
     },
   });
   if (tasksResult.ok) {
-    const { _source } = tasksResult.response;
-    const { completed, error } = (_source || {}) as OpenTaskResult["_source"];
+    const _source = tasksResult.response;
+    const { completed, error } = (_source || {}) as OpenTaskResult;
     if (completed) {
       const { acknowledged, shards_acknowledged } = _source.response || {};
       if (acknowledged && shards_acknowledged) {

diff --git a/public/JobHandler/callbacks/reindex.tsx b/public/JobHandler/callbacks/reindex.tsx
@@ -27,15 +27,15 @@ export const callbackForReindex: CallbackType = async (job: ReindexJobMetaData,
   const tasksResult = await commonService.apiCaller<TaskResult>({
     endpoint: "transport.request",
     data: {
-      path: `/.tasks/_doc/${extras.taskId}`,
+      path: `/_tasks/${extras.taskId}`,
       method: "GET",
     },
   });
   if (tasksResult.ok) {
-    const { _source, found } = tasksResult.response;
-    const { completed, response, error } = (_source || {}) as ReindexTaskResult["_source"];
+    const _source = tasksResult.response;
+    const { completed, response, error } = (_source || {}) as ReindexTaskResult;
     const { failures, canceled } = response || {};
-    if (completed && found) {
+    if (completed) {
       if (extras.toastId) {
         core.notifications.toasts.remove(extras.toastId);
       }

diff --git a/public/JobHandler/callbacks/shrink.tsx b/public/JobHandler/callbacks/shrink.tsx
@@ -17,15 +17,15 @@ export const callbackForShrink: CallbackType = async (job: RecoveryJobMetaData,
     const tasksResult = await commonService.apiCaller<TaskResult>({
       endpoint: "transport.request",
       data: {
-        path: `/.tasks/_doc/${extras.taskId}`,
+        path: `/_tasks/${extras.taskId}`,
         method: "GET",
       },
     });
 
     if (tasksResult.ok) {
-      const { _source, found } = tasksResult.response;
-      const { completed, error } = (_source || {}) as TaskResult["_source"];
-      if (completed && found) {
+      const _source = tasksResult.response;
+      const { completed, error } = (_source || {}) as TaskResult;
+      if (completed) {
         if (extras.toastId) {
           core.notifications.toasts.remove(extras.toastId);
         }

diff --git a/public/JobHandler/callbacks/split.tsx b/public/JobHandler/callbacks/split.tsx
@@ -17,14 +17,14 @@ export const callbackForSplit: CallbackType = async (job: RecoveryJobMetaData, {
     const tasksResult = await commonService.apiCaller<TaskResult>({
       endpoint: "transport.request",
       data: {
-        path: `/.tasks/_doc/${extras.taskId}`,
+        path: `/_tasks/${extras.taskId}`,
         method: "GET",
       },
     });
     if (tasksResult.ok) {
-      const { _source, found } = tasksResult.response;
-      const { completed, error } = (_source || {}) as TaskResult["_source"];
-      if (completed && found) {
+      const _source = tasksResult.response;
+      const { completed, error } = (_source || {}) as TaskResult;
+      if (completed) {
         if (extras.toastId) {
           core.notifications.toasts.remove(extras.toastId);
         }

diff --git a/public/JobHandler/interface.ts b/public/JobHandler/interface.ts
@@ -13,14 +13,11 @@ export type CallbackType = (
 ) => Promise<boolean>;
 
 export type TaskResult<T = {}> = {
-  found: boolean;
-  _source: {
-    completed: boolean;
-    response: T;
-    error?: {
-      type: string;
-      reason: string;
-    };
+  completed: boolean;
+  response: T;
+  error?: {
+    type: string;
+    reason: string;
   };
 };