[Upgrade Assistant] Remove ML/Watcher logic

x-pack/plugins/translations/translations/ja-JP.json

@@ -25820,12 +25820,8 @@
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.cancelButton.cancellingLabel": "キャンセル中…",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.cancelButton.errorLabel": "キャンセルできませんでした",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.createIndexStepTitle": "新規インデックスを作成中",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.pauseMlStepTitle": "機械学習ジョブを一時停止中",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.readonlyStepTitle": "古いインデックスを読み込み専用に設定中",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.reindexingDocumentsStepTitle": "ドキュメントを再インデックス中",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.resumeMlStepTitle": "機械学習ジョブを再開中",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.resumeWatcherStepTitle": "Watcher を再開中",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.stopWatcherStepTitle": "Watcher を停止中",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklistTitle": "プロセスを再インデックス中",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.indexClosedCallout.calloutDetails": "このインデックスは現在閉じています。アップグレードアシスタントが開き、再インデックスを実行してからインデックスを閉じます。 {reindexingMayTakeLongerEmph}。詳細については {docs} をご覧ください。",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.indexClosedCallout.calloutDetails.reindexingTakesLongerEmphasis": "再インデックスには通常よりも時間がかかることがあります",

x-pack/plugins/translations/translations/zh-CN.json

@@ -26254,12 +26254,8 @@
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.cancelButton.cancellingLabel": "正在取消……",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.cancelButton.errorLabel": "无法取消",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.createIndexStepTitle": "正在创建新索引",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.pauseMlStepTitle": "正在暂停 Machine Learning 作业",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.readonlyStepTitle": "正在将旧索引设置为只读",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.reindexingDocumentsStepTitle": "正在重新索引文档",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.resumeMlStepTitle": "正在恢复 Machine Learning 作业",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.resumeWatcherStepTitle": "正在恢复 Watcher",
-    "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.stopWatcherStepTitle": "正在停止 Watcher",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklistTitle": "重新索引过程",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.indexClosedCallout.calloutDetails": "此索引当前已关闭。升级助手将打开索引，重新索引，然后关闭索引。{reindexingMayTakeLongerEmph}。请参阅文档{docs}以了解更多信息。",
     "xpack.upgradeAssistant.checkupTab.reindexing.flyout.indexClosedCallout.calloutDetails.reindexingTakesLongerEmphasis": "重新索引可能比通常花费更多的时间",

x-pack/plugins/upgrade_assistant/common/types.ts

@@ -114,11 +114,6 @@ export interface ReindexWarning {
   };
 }
 
-export enum IndexGroup {
-  ml = '___ML_REINDEX_LOCK___',
-  watcher = '___WATCHER_REINDEX_LOCK___',
-}
-
 // Telemetry types
 export const UPGRADE_ASSISTANT_TYPE = 'upgrade-assistant-telemetry';
 export const UPGRADE_ASSISTANT_DOC_ID = 'upgrade-assistant-telemetry';

x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/progress.test.tsx

@@ -8,7 +8,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { IndexGroup, ReindexStatus, ReindexStep } from '../../../../../../../common/types';
+import { ReindexStatus, ReindexStep } from '../../../../../../../common/types';
 import type { ReindexState } from '../use_reindex_state';
 import { ReindexProgress } from './progress';
 
@@ -118,7 +118,6 @@ describe('ReindexProgress', () => {
           {
             lastCompletedStep: ReindexStep.created,
             status: ReindexStatus.inProgress,
-            indexGroup: IndexGroup.ml,
             reindexTaskPercComplete: null,
             errorMessage: null,
           } as ReindexState
@@ -131,14 +130,6 @@ describe('ReindexProgress', () => {
 <StepProgress
   steps={
     Array [
-      Object {
-        "status": "inProgress",
-        "title": <FormattedMessage
-          defaultMessage="Pausing Machine Learning jobs"
-          id="xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.pauseMlStepTitle"
-          values={Object {}}
-        />,
-      },
       Object {
         "status": "incomplete",
         "title": <FormattedMessage
@@ -171,14 +162,6 @@ describe('ReindexProgress', () => {
           values={Object {}}
         />,
       },
-      Object {
-        "status": "incomplete",
-        "title": <FormattedMessage
-          defaultMessage="Resuming Machine Learning jobs"
-          id="xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.resumeMlStepTitle"
-          values={Object {}}
-        />,
-      },
     ]
   }
 />

x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/progress.tsx

@@ -17,7 +17,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { IndexGroup, ReindexStatus, ReindexStep } from '../../../../../../../common/types';
+import { ReindexStatus, ReindexStep } from '../../../../../../../common/types';
 import { LoadingState } from '../../../../types';
 import type { ReindexState } from '../use_reindex_state';
 import { StepProgress, StepProgressStep } from './step_progress';
@@ -118,7 +118,7 @@ export const ReindexProgress: React.FunctionComponent<{
   reindexState: ReindexState;
   cancelReindex: () => void;
 }> = (props) => {
-  const { errorMessage, indexGroup, lastCompletedStep = -1, status } = props.reindexState;
+  const { errorMessage, lastCompletedStep = -1, status } = props.reindexState;
   const stepDetails = (thisStep: ReindexStep): Pick<StepProgressStep, 'status' | 'children'> => {
     const previousStep = orderedSteps[orderedSteps.indexOf(thisStep) - 1];
 
@@ -225,46 +225,5 @@ export const ReindexProgress: React.FunctionComponent<{
     },
   ];
 
-  // If this index is part of an index group, add the approriate group services steps.
-  if (indexGroup === IndexGroup.ml) {
-    steps.unshift({
-      title: (
-        <FormattedMessage
-          id="xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.pauseMlStepTitle"
-          defaultMessage="Pausing Machine Learning jobs"
-        />
-      ),
-      ...stepDetails(ReindexStep.indexGroupServicesStopped),
-    });
-    steps.push({
-      title: (
-        <FormattedMessage
-          id="xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.resumeMlStepTitle"
-          defaultMessage="Resuming Machine Learning jobs"
-        />
-      ),
-      ...stepDetails(ReindexStep.indexGroupServicesStarted),
-    });
-  } else if (indexGroup === IndexGroup.watcher) {
-    steps.unshift({
-      title: (
-        <FormattedMessage
-          id="xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.stopWatcherStepTitle"
-          defaultMessage="Stopping Watcher"
-        />
-      ),
-      ...stepDetails(ReindexStep.indexGroupServicesStopped),
-    });
-    steps.push({
-      title: (
-        <FormattedMessage
-          id="xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.reindexingChecklist.resumeWatcherStepTitle"
-          defaultMessage="Resuming Watcher"
-        />
-      ),
-      ...stepDetails(ReindexStep.indexGroupServicesStarted),
-    });
-  }
-
   return <StepProgress steps={steps} />;
 };

x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/use_reindex_state.tsx

@@ -8,7 +8,6 @@
 import { useRef, useCallback, useState, useEffect } from 'react';
 
 import {
-  IndexGroup,
   ReindexOperation,
   ReindexStatus,
   ReindexStep,
@@ -28,19 +27,17 @@ export interface ReindexState {
   errorMessage: string | null;
   reindexWarnings?: ReindexWarning[];
   hasRequiredPrivileges?: boolean;
-  indexGroup?: IndexGroup;
 }
 
 interface StatusResponse {
   warnings?: ReindexWarning[];
   reindexOp?: ReindexOperation;
   hasRequiredPrivileges?: boolean;
-  indexGroup?: IndexGroup;
 }
 
 const getReindexState = (
   reindexState: ReindexState,
-  { reindexOp, warnings, hasRequiredPrivileges, indexGroup }: StatusResponse
+  { reindexOp, warnings, hasRequiredPrivileges }: StatusResponse
 ) => {
   const newReindexState = {
     ...reindexState,
@@ -55,10 +52,6 @@ const getReindexState = (
     newReindexState.hasRequiredPrivileges = hasRequiredPrivileges;
   }
 
-  if (indexGroup) {
-    newReindexState.indexGroup = indexGroup;
-  }
-
   if (reindexOp) {
     // Prevent the UI flickering back to inProgress after cancelling
     newReindexState.lastCompletedStep = reindexOp.lastCompletedStep;

x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.test.ts

@@ -13,7 +13,6 @@ import { ScopedClusterClientMock } from 'src/core/server/elasticsearch/client/mo
 import moment from 'moment';
 
 import {
-  IndexGroup,
   REINDEX_OP_TYPE,
   ReindexSavedObject,
   ReindexStatus,
@@ -283,46 +282,4 @@ describe('ReindexActions', () => {
       await expect(actions.getFlatSettings('myIndex')).resolves.toBeNull();
     });
   });
-
-  describe('runWhileConsumerLocked', () => {
-    Object.entries(IndexGroup).forEach(([typeKey, consumerType]) => {
-      describe(`IndexConsumerType.${typeKey}`, () => {
-        it('creates the lock doc if it does not exist and executes callback', async () => {
-          expect.assertions(3);
-          client.get.mockRejectedValueOnce(SavedObjectsErrorHelpers.createGenericNotFoundError()); // mock no ML doc exists yet
-          client.create.mockImplementationOnce((type: any, attributes: any, { id }: any) =>
-            Promise.resolve({
-              type,
-              id,
-              attributes,
-            })
-          );
-
-          let flip = false;
-          await actions.runWhileIndexGroupLocked(consumerType, async (mlDoc) => {
-            expect(mlDoc.id).toEqual(consumerType);
-            expect(mlDoc.attributes.runningReindexCount).toEqual(0);
-            flip = true;
-            return mlDoc;
-          });
-          expect(flip).toEqual(true);
-        });
-
-        it('fails after 10 attempts to lock', async () => {
-          client.get.mockResolvedValue({
-            type: REINDEX_OP_TYPE,
-            id: consumerType,
-            attributes: { mlReindexCount: 0 },
-          });
-
-          client.update.mockRejectedValue(new Error('NO LOCKING!'));
-
-          await expect(
-            actions.runWhileIndexGroupLocked(consumerType, async (m) => m)
-          ).rejects.toThrow('Could not acquire lock for ML jobs');
-          expect(client.update).toHaveBeenCalledTimes(10);
-        }, 20000);
-      });
-    });
-  });
 });

x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_actions.ts

@@ -13,7 +13,6 @@ import {
   ElasticsearchClient,
 } from 'src/core/server';
 import {
-  IndexGroup,
   REINDEX_OP_TYPE,
   ReindexOperation,
   ReindexOptions,
@@ -91,33 +90,6 @@ export interface ReindexActions {
     indexName: string,
     withTypeName?: boolean
   ): Promise<FlatSettings | FlatSettingsWithTypeName | null>;
-
-  // ----- Functions below are for enforcing locks around groups of indices like ML or Watcher
-
-  /**
-   * Atomically increments the number of reindex operations running for an index group.
-   */
-  incrementIndexGroupReindexes(group: IndexGroup): Promise<void>;
-
-  /**
-   * Atomically decrements the number of reindex operations running for an index group.
-   */
-  decrementIndexGroupReindexes(group: IndexGroup): Promise<void>;
-
-  /**
-   * Runs a callback function while locking an index group.
-   * @param func A function to run with the locked index group lock document. Must return a promise that resolves
-   * to the updated ReindexSavedObject.
-   */
-  runWhileIndexGroupLocked(
-    group: IndexGroup,
-    func: (lockDoc: ReindexSavedObject) => Promise<ReindexSavedObject>
-  ): Promise<void>;
-
-  /**
-   * Exposed only for testing, DO NOT USE.
-   */
-  _fetchAndLockIndexGroupDoc(group: IndexGroup): Promise<ReindexSavedObject>;
 }
 
 export const reindexActionsFactory = (
@@ -270,76 +242,5 @@ export const reindexActionsFactory = (
 
       return flatSettings.body[indexName];
     },
-
-    async _fetchAndLockIndexGroupDoc(indexGroup) {
-      const fetchDoc = async () => {
-        try {
-          // The IndexGroup enum value (a string) serves as the ID of the lock doc
-          return await client.get<ReindexOperation>(REINDEX_OP_TYPE, indexGroup);
-        } catch (e) {
-          if (client.errors.isNotFoundError(e)) {
-            return await client.create<ReindexOperation>(
-              REINDEX_OP_TYPE,
-              {
-                indexName: null,
-                newIndexName: null,
-                locked: null,
-                status: null,
-                lastCompletedStep: null,
-                reindexTaskId: null,
-                reindexTaskPercComplete: null,
-                errorMessage: null,
-                runningReindexCount: 0,
-              } as any,
-              { id: indexGroup }
-            );
-          } else {
-            throw e;
-          }
-        }
-      };
-
-      const lockDoc = async (attempt = 1): Promise<ReindexSavedObject> => {
-        try {
-          // Refetch the document each time to avoid version conflicts.
-          return await acquireLock(await fetchDoc());
-        } catch (e) {
-          if (attempt >= 10) {
-            throw new Error(`Could not acquire lock for ML jobs`);
-          }
-
-          await new Promise((resolve) => setTimeout(resolve, 1000));
-          return lockDoc(attempt + 1);
-        }
-      };
-
-      return lockDoc();
-    },
-
-    async incrementIndexGroupReindexes(indexGroup) {
-      this.runWhileIndexGroupLocked(indexGroup, (lockDoc) =>
-        this.updateReindexOp(lockDoc, {
-          runningReindexCount: lockDoc.attributes.runningReindexCount! + 1,
-        })
-      );
-    },
-
-    async decrementIndexGroupReindexes(indexGroup) {
-      this.runWhileIndexGroupLocked(indexGroup, (lockDoc) =>
-        this.updateReindexOp(lockDoc, {
-          runningReindexCount: lockDoc.attributes.runningReindexCount! - 1,
-        })
-      );
-    },
-
-    async runWhileIndexGroupLocked(indexGroup, func) {
-      let lockDoc = await this._fetchAndLockIndexGroupDoc(indexGroup);
-
-      try {
-        lockDoc = await func(lockDoc);
-      } finally {
-        await releaseLock(lockDoc);
-      }
-    },
   };
 };