waitForIndexStatusYellow: Don't reject on 408 status from health api (#…

…119136) (#119302)
elastic · Nov 22, 2021 · 9bc13b3 · 9bc13b3
1 parent bd63968
commit 9bc13b3
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_index_status_yellow.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_index_status_yellow.ts
@@ -40,13 +40,16 @@ export const waitForIndexStatusYellow =
   }: WaitForIndexStatusYellowParams): TaskEither.TaskEither<RetryableEsClientError, {}> =>
   () => {
     return client.cluster
-      .health({
-        index,
-        wait_for_status: 'yellow',
-        timeout,
-        // @ts-expect-error
-        return_200_for_cluster_health_timeout: true, // opt-in to the 8.0 breaking behaviour to prevent a deprecation log
-      })
+      .health(
+        {
+          index,
+          wait_for_status: 'yellow',
+          timeout,
+        },
+        // Don't reject on status code 408 so that we can handle the timeout
+        // explicitly and provide more context in the error message
+        { ignore: [408] }
+      )
       .then((res) => {
         if (res.body.timed_out === true) {
           return Either.left({