Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only provide obsoleteIndexTemplatePattern to the default index migrator to avoid race conditions #42016

Merged
merged 4 commits into from
Jul 25, 2019
Merged

Only provide obsoleteIndexTemplatePattern to the default index migrator to avoid race conditions #42016

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc081c9
Only provide obsoleteIndexTemplatePattern to the default index migrat…
mikecote Jul 25, 2019
1b13b1f
Add test
mikecote Jul 25, 2019
d18ae20
Merge branch 'master' of github.com:elastic/kibana into migrations/ob…
mikecote Jul 25, 2019
d39e393
Apply PR feedback
mikecote Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,20 @@ export class KibanaMigrator {
await server.plugins.elasticsearch.waitUntilReady();

const config = server.config();
const defaultIndex = config.get('kibana.index');
const indexMap = createIndexMap(
config.get('kibana.index'),
defaultIndex,
this.kbnServer.uiExports.savedObjectSchemas,
this.mappingProperties
);

const migrators = Object.keys(indexMap).map(index => {
let obsoleteIndexTemplatePattern;
// Only necessary for the migrator of the default index.
// This will cause race conditions between migrators otherwise.
if (index === defaultIndex) {
obsoleteIndexTemplatePattern = 'kibana_index_template*';
}
return new IndexMigrator({
batchSize: config.get('migrations.batchSize'),
callCluster: server.plugins.elasticsearch!.getCluster('admin').callWithInternalUser,
Expand All @@ -110,7 +117,7 @@ export class KibanaMigrator {
pollInterval: config.get('migrations.pollInterval'),
scrollDuration: config.get('migrations.scrollDuration'),
serializer: this.serializer,
obsoleteIndexTemplatePattern: 'kibana_index_template*',
obsoleteIndexTemplatePattern,
convertToAliasScript: indexMap[index].script,
});
});
Expand Down