Skip to content

Commit

Permalink
[main] [UA] Remove index_mapper_dynamic setting when reindexing and r…
Browse files Browse the repository at this point in the history
…emove duped copy from header (#119569)

* [Upgrade Assistant] Remove index_mapper_dynamic setting when reindexing (#119441)
* [Upgrade Assistant] Remove duped copy from header (#119476)
  • Loading branch information
sabarasaba authored Nov 24, 2021
1 parent 7927bd4 commit 5a63073
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const i18nTexts = {
}),
pageDescription: i18n.translate('xpack.upgradeAssistant.esDeprecations.pageDescription', {
defaultMessage:
'Resolve all critical issues before upgrading. Before making changes, ensure you have a current snapshot of your cluster. Indices created before 7.0 must be reindexed or removed. To start multiple reindexing tasks in a single request, use the Kibana batch reindexing API.',
'Resolve all critical issues before upgrading. Before making changes, ensure you have a current snapshot of your cluster. Indices created before 7.0 must be reindexed or removed.',
}),
isLoading: i18n.translate('xpack.upgradeAssistant.esDeprecations.loadingText', {
defaultMessage: 'Loading deprecation issues…',
Expand Down Expand Up @@ -136,8 +136,7 @@ export const EsDeprecations = withRouter(({ history }: RouteComponentProps) => {
pageTitle={i18nTexts.pageTitle}
description={
<>
{i18nTexts.pageDescription}
{getBatchReindexLink(docLinks)}
{i18nTexts.pageDescription} {getBatchReindexLink(docLinks)}
</>
}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ describe('transformFlatSettings', () => {
'index.verified_before_close': 'true',
'index.version.created': '123123',
'index.version.upgraded': '123123',
'index.mapper.dynamic': 'true',

// Deprecated settings
'index.force_memory_term_dictionary': '1024',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ const removeUnsettableSettings = (settings: FlatSettings['settings']) =>
'index.verified_before_close',
'index.version.created',

// Ignored since 6.x and forbidden in 7.x
'index.mapper.dynamic',

// Deprecated in 9.0
'index.version.upgraded',
]);
Expand Down

0 comments on commit 5a63073

Please sign in to comment.