Allow relocating SO to different indices during migration

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/kibana_migrator.test.ts

@@ -134,7 +134,8 @@ describe('KibanaMigrator', () => {
       );
     });
 
-    it('only runs migrations once if called multiple times', async () => {
+    // eslint-disable-next-line jest/no-focused-tests
+    fit('only runs migrations once if called multiple times', async () => {
       const options = mockOptions();
       options.client.indices.get.mockResponse({}, { statusCode: 200 });
       options.client.indices.getMapping.mockResponse(mappingsResponseWithoutIndexTypesMap, {
@@ -234,8 +235,7 @@ describe('KibanaMigrator', () => {
 
     describe('for V2 migrations', () => {
       describe('where some SO types must be relocated', () => {
-        // eslint-disable-next-line jest/no-focused-tests
-        fit('runs successfully', async () => {
+        it('runs successfully', async () => {
           const options = mockV2MigrationOptions();
           options.client.indices.getMapping.mockResponse(mappingsResponseWithoutIndexTypesMap, {
             statusCode: 200,

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/kibana_migrator.ts

@@ -32,7 +32,7 @@ import {
   type MigrationResult,
   type IndexTypesMap,
 } from '@kbn/core-saved-objects-base-server-internal';
-import { getIndicesInvoledInRelocation } from './kibana_migrator_utils';
+import { getIndicesInvolvedInRelocation } from './kibana_migrator_utils';
 import { buildActiveMappings, buildTypesMappings } from './core';
 import { DocumentMigrator } from './document_migrator';
 import { createIndexMap } from './core/build_index_map';
@@ -189,7 +189,7 @@ export class KibanaMigrator implements IKibanaMigrator {
 
     // compare indexTypesMap with the one present (or not) in the .kibana index meta
     // and check if some SO types have been moved to different indices
-    const indicesWithMovingTypes = await getIndicesInvoledInRelocation({
+    const indicesWithMovingTypes = await getIndicesInvolvedInRelocation({
       mainIndex: MAIN_SAVED_OBJECT_INDEX,
       client: this.client,
       indexTypesMap,

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/kibana_migrator_utils.test.ts

@@ -14,7 +14,7 @@ import { DEFAULT_INDEX_TYPES_MAP } from './kibana_migrator_constants';
 import {
   calculateTypeStatuses,
   createMultiPromiseDefer,
-  getIndicesInvoledInRelocation,
+  getIndicesInvolvedInRelocation,
   indexMapToIndexTypesMap,
 } from './kibana_migrator_utils';
 import { INDEX_MAP_BEFORE_SPLIT } from './kibana_migrator_utils.fixtures';
@@ -41,8 +41,8 @@ describe('createMultiPromiseDefer', () => {
   });
 });
 
-describe('getIndicesInvoledInRelocation', () => {
-  const getIndicesInvoledInRelocationParams = () => {
+describe('getIndicesInvolvedInRelocation', () => {
+  const getIndicesInvolvedInRelocationParams = () => {
     const client = elasticsearchClientMock.createElasticsearchClient();
     (client as any).child = jest.fn().mockImplementation(() => client);
 
@@ -56,9 +56,9 @@ describe('getIndicesInvoledInRelocation', () => {
   };
 
   it('tries to get the indexTypesMap from the mainIndex', async () => {
-    const params = getIndicesInvoledInRelocationParams();
+    const params = getIndicesInvolvedInRelocationParams();
     try {
-      await getIndicesInvoledInRelocation(params);
+      await getIndicesInvolvedInRelocation(params);
     } catch (err) {
       // ignore
     }
@@ -70,7 +70,7 @@ describe('getIndicesInvoledInRelocation', () => {
   });
 
   it('fails if the query to get indexTypesMap fails with critical error', async () => {
-    const params = getIndicesInvoledInRelocationParams();
+    const params = getIndicesInvolvedInRelocationParams();
     params.client.indices.getMapping.mockImplementation(() =>
       elasticsearchClientMock.createErrorTransportRequestPromise(
         new errors.ResponseError({
@@ -87,13 +87,13 @@ describe('getIndicesInvoledInRelocation', () => {
         })
       )
     );
-    expect(getIndicesInvoledInRelocation(params)).rejects.toThrowErrorMatchingInlineSnapshot(
+    expect(getIndicesInvolvedInRelocation(params)).rejects.toThrowErrorMatchingInlineSnapshot(
       `"error_type"`
     );
   });
 
   it('assumes fresh deployment if the mainIndex does not exist, returns an empty list of moving types', async () => {
-    const params = getIndicesInvoledInRelocationParams();
+    const params = getIndicesInvolvedInRelocationParams();
     params.client.indices.getMapping.mockImplementation(() =>
       elasticsearchClientMock.createErrorTransportRequestPromise(
         new errors.ResponseError({
@@ -110,13 +110,13 @@ describe('getIndicesInvoledInRelocation', () => {
         })
       )
     );
-    expect(getIndicesInvoledInRelocation(params)).resolves.toEqual([]);
+    expect(getIndicesInvolvedInRelocation(params)).resolves.toEqual([]);
   });
 
   describe('if mainIndex exists', () => {
     describe('but it does not have an indexTypeMap stored', () => {
       it('uses the defaultIndexTypeMap and finds out which indices are involved in a relocation', async () => {
-        const params = getIndicesInvoledInRelocationParams();
+        const params = getIndicesInvolvedInRelocationParams();
         params.client.indices.getMapping.mockReturnValue(
           Promise.resolve({
             '.kibana_8.7.0_001': {
@@ -145,13 +145,13 @@ describe('getIndicesInvoledInRelocation', () => {
           '.indexC': ['type2', 'type3'],
         };
 
-        expect(getIndicesInvoledInRelocation(params)).resolves.toEqual(['.indexA', '.indexC']);
+        expect(getIndicesInvolvedInRelocation(params)).resolves.toEqual(['.indexA', '.indexC']);
       });
     });
 
     describe('and it has an indexTypeMap stored', () => {
       it('compares stored indexTypeMap against desired one, and finds out which indices are involved in a relocation', async () => {
-        const params = getIndicesInvoledInRelocationParams();
+        const params = getIndicesInvolvedInRelocationParams();
         params.client.indices.getMapping.mockReturnValue(
           Promise.resolve({
             '.kibana_8.8.0_001': {
@@ -189,7 +189,7 @@ describe('getIndicesInvoledInRelocation', () => {
           '.indexD': ['type5', 'type6'],
         };
 
-        expect(getIndicesInvoledInRelocation(params)).resolves.toEqual(['.indexB', '.indexD']);
+        expect(getIndicesInvolvedInRelocation(params)).resolves.toEqual(['.indexB', '.indexD']);
       });
     });
   });

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/kibana_migrator_utils.ts

@@ -26,7 +26,7 @@ export class Defer<T> {
 export const defer = () => new Defer<void>();
 
 export function createMultiPromiseDefer(indices: string[]): Record<string, Defer<void>> {
-  const defers: Array<Defer<void>> = new Array(indices.length).fill(true).map(defer);
+  const defers: Array<Defer<void>> = indices.map(defer);
   const all = Promise.all(defers.map(({ promise }) => promise));
   return indices.reduce<Record<string, Defer<any>>>((acc, indexName, i) => {
     const { resolve, reject } = defers[i];
@@ -66,7 +66,7 @@ export async function getCurrentIndexTypesMap({
   }
 }
 
-export async function getIndicesInvoledInRelocation({
+export async function getIndicesInvolvedInRelocation({
   client,
   mainIndex,
   indexTypesMap,
@@ -95,13 +95,12 @@ export async function getIndicesInvoledInRelocation({
 
   const typeIndexDistribution = calculateTypeStatuses(currentIndexTypesMap, indexTypesMap);
 
-  const relocated = Object.entries(typeIndexDistribution).filter(
-    ([, { status }]) => status === TypeStatus.Moved
-  );
-  relocated.forEach(([, { currentIndex, targetIndex }]) => {
-    indicesWithMovingTypesSet.add(currentIndex!);
-    indicesWithMovingTypesSet.add(targetIndex!);
-  });
+  Object.values(typeIndexDistribution)
+    .filter(({ status }) => status === TypeStatus.Moved)
+    .forEach(({ currentIndex, targetIndex }) => {
+      indicesWithMovingTypesSet.add(currentIndex!);
+      indicesWithMovingTypesSet.add(targetIndex!);
+    });
 
   return Array.from(indicesWithMovingTypesSet);
 }

packages/core/saved-objects/core-saved-objects-migration-server-internal/src/migrations_state_action_machine.ts

@@ -113,7 +113,7 @@ export async function migrationStateActionMachine({
       try {
         await abort(finalState);
       } catch (e) {
-        logger.warn('Failed to correctly abort migrations:', e.message);
+        logger.warn('Failed to cleanup after migrations:', e.message);
       }
 
       const errorMessage =
@@ -134,7 +134,7 @@ export async function migrationStateActionMachine({
     try {
       await abort(lastState);
     } catch (err) {
-      logger.warn('Failed to correctly abort migrations:', err.message);
+      logger.warn('Failed to cleanup after migrations:', err.message);
     }
     if (e instanceof EsErrors.ResponseError) {
       // Log the failed request. This is very similar to the

src/core/server/integration_tests/saved_objects/migrations/group3/split_kibana_index.test.ts

@@ -275,7 +275,7 @@ describe('split .kibana index into multiple system indices', () => {
         expect(logs).toMatch(`[${newIndex}] READY_TO_REINDEX_SYNC -> DONE_REINDEXING_SYNC.`);
       });
 
-      // the .kibana migrator is involed in a relocation, it must also reindex
+      // the .kibana migrator is involved in a relocation, it must also reindex
       expect(logs).toMatch('[.kibana] INIT -> WAIT_FOR_YELLOW_SOURCE.');
       expect(logs).toMatch('[.kibana] WAIT_FOR_YELLOW_SOURCE -> CHECK_UNKNOWN_DOCUMENTS.');
       expect(logs).toMatch('[.kibana] CHECK_UNKNOWN_DOCUMENTS -> SET_SOURCE_WRITE_BLOCK.');