Skip to content

Commit

Permalink
Revert "Try to fix v2 migrations for pre-release builds"
Browse files Browse the repository at this point in the history
This reverts commit a9a9355.
  • Loading branch information
rudolf committed Jan 28, 2021
1 parent 34c5d87 commit bb4f238
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/core/server/saved_objects/migrationsv2/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -715,9 +715,6 @@ export const createInitialState = ({
migrationVersionPerType: SavedObjectsMigrationVersion;
indexPrefix: string;
}): InitState => {
// Convert the kibanaVersion to lower case so that it's valid for using in an
// index name. This is necessary for pre-release builds like `8.0.0-SNAPSHOT`
const kibanaVersionLc = kibanaVersion.toLowerCase();
const outdatedDocumentsQuery = {
bool: {
should: Object.entries(migrationVersionPerType).map(([type, latestVersion]) => ({
Expand Down Expand Up @@ -747,10 +744,10 @@ export const createInitialState = ({
indexPrefix,
legacyIndex: indexPrefix,
currentAlias: indexPrefix,
versionAlias: `${indexPrefix}_${kibanaVersionLc}`,
versionIndex: `${indexPrefix}_${kibanaVersionLc}_001`,
tempIndex: `${indexPrefix}_${kibanaVersionLc}_reindex_temp`,
kibanaVersion: kibanaVersionLc,
versionAlias: `${indexPrefix}_${kibanaVersion}`,
versionIndex: `${indexPrefix}_${kibanaVersion}_001`,
tempIndex: `${indexPrefix}_${kibanaVersion}_reindex_temp`,
kibanaVersion,
preMigrationScript: Option.fromNullable(preMigrationScript),
targetIndexMappings: targetMappings,
tempIndexMappings: reindexTargetMappings,
Expand Down

0 comments on commit bb4f238

Please sign in to comment.