Fix bulk indexing batches

elastic · May 24, 2023 · 2c57bc0 · 2c57bc0
1 parent 1314315
commit 2c57bc0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/...-migration-server-internal/src/__snapshots__/migrations_state_action_machine.test.ts.snap b/...-migration-server-internal/src/__snapshots__/migrations_state_action_machine.test.ts.snap
diff --git a/...ved-objects/core-saved-objects-migration-server-internal/src/model/create_batches.test.ts b/...ved-objects/core-saved-objects-migration-server-internal/src/model/create_batches.test.ts
@@ -92,7 +92,7 @@ describe('createBatches', () => {
       expect(
         createBatches({
           documents,
-          maxBatchSizeBytes: (DOCUMENT_SIZE_BYTES + 43) * 2, // add extra length for 'index' property
+          maxBatchSizeBytes: (DOCUMENT_SIZE_BYTES + 49) * 2, // add extra length for 'index' property
           typeIndexMap: buildTempIndexMap(
             {
               '.kibana': ['dashboard'],
@@ -108,7 +108,7 @@ describe('createBatches', () => {
               {
                 index: {
                   _id: '',
-                  _index: '.kibana_8.8.0_reindex_temp',
+                  _index: '.kibana_8.8.0_reindex_temp_alias',
                 },
               },
               { type: 'dashboard', title: 'my saved object title ¹' },
@@ -117,7 +117,7 @@ describe('createBatches', () => {
               {
                 index: {
                   _id: '',
-                  _index: '.kibana_8.8.0_reindex_temp',
+                  _index: '.kibana_8.8.0_reindex_temp_alias',
                 },
               },
               { type: 'dashboard', title: 'my saved object title ²' },
@@ -128,7 +128,7 @@ describe('createBatches', () => {
               {
                 index: {
                   _id: '',
-                  _index: '.kibana_cases_8.8.0_reindex_temp',
+                  _index: '.kibana_cases_8.8.0_reindex_temp_alias',
                 },
               },
               { type: 'cases', title: 'a case' },
@@ -137,7 +137,7 @@ describe('createBatches', () => {
               {
                 index: {
                   _id: '',
-                  _index: '.kibana_cases_8.8.0_reindex_temp',
+                  _index: '.kibana_cases_8.8.0_reindex_temp_alias',
                 },
               },
               { type: 'cases-comments', title: 'a case comment #1' },
@@ -148,7 +148,7 @@ describe('createBatches', () => {
               {
                 index: {
                   _id: '',
-                  _index: '.kibana_cases_8.8.0_reindex_temp',
+                  _index: '.kibana_cases_8.8.0_reindex_temp_alias',
                 },
               },
               { type: 'cases-user-actions', title: 'a case user action' },

diff --git a/...core/saved-objects/core-saved-objects-migration-server-internal/src/model/helpers.test.ts b/...core/saved-objects/core-saved-objects-migration-server-internal/src/model/helpers.test.ts
@@ -303,7 +303,7 @@ describe('createBulkIndexOperationTuple', () => {
         Object {
           "index": Object {
             "_id": "",
-            "_index": ".kibana_cases_8.8.0_reindex_temp",
+            "_index": ".kibana_cases_8.8.0_reindex_temp_alias",
           },
         },
         Object {

diff --git a/...ages/core/saved-objects/core-saved-objects-migration-server-internal/src/model/helpers.ts b/...ages/core/saved-objects/core-saved-objects-migration-server-internal/src/model/helpers.ts
@@ -227,7 +227,9 @@ export const createBulkIndexOperationTuple = (
     {
       index: {
         _id: doc._id,
-        ...(typeIndexMap[doc._source.type] && { _index: typeIndexMap[doc._source.type] }),
+        ...(typeIndexMap[doc._source.type] && {
+          _index: typeIndexMap[doc._source.type] + '_alias',
+        }),
         // use optimistic concurrency control to ensure that outdated
         // documents are only overwritten once with the latest version
         ...(typeof doc._seq_no !== 'undefined' && { if_seq_no: doc._seq_no }),