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

[Upgrade Assistant] Update logic for handling reindex failures #124571

Merged
merged 5 commits into from
Feb 10, 2022
Merged

[Upgrade Assistant] Update logic for handling reindex failures #124571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
519cb6c
adjust logic for determining reindex failures
alisonelizabeth Feb 3, 2022
a32ac7e
Merge branch '7.17' of https://github.com/elastic/kibana into ua/rein…
alisonelizabeth Feb 7, 2022
8ea0b6d
Merge branch '7.17' into ua/reindex_error_handling
kibanamachine Feb 7, 2022
9554953
Merge branch '7.17' into ua/reindex_error_handling
kibanamachine Feb 7, 2022
e3a0b1f
Merge branch '7.17' into ua/reindex_error_handling
kibanamachine Feb 9, 2022
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
2 changes: 1 addition & 1 deletion ...pplication/components/es_deprecations/deprecation_types/reindex/flyout/checklist_step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ export const ChecklistFlyoutStep: React.FunctionComponent<{
)}
{(hasFetchFailed || hasReindexingFailed) && (
<>
<EuiSpacer />
<EuiCallOut
color="danger"
iconType="alert"
Expand All @@ -130,6 +129,7 @@ export const ChecklistFlyoutStep: React.FunctionComponent<{
>
{reindexState.errorMessage}
</EuiCallOut>
<EuiSpacer />
</>
)}
<EuiText>
Expand Down
8 changes: 2 additions & 6 deletions x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,8 @@ export const reindexServiceFactory = (
// Do any other cleanup work necessary
reindexOp = await cleanupChanges(reindexOp);
} else {
// Check that it reindexed all documents
const {
body: { count },
} = await esClient.count({ index: reindexOp.attributes.indexName });

if (taskResponse.task.status!.created < count) {
Copy link
Contributor Author

@alisonelizabeth alisonelizabeth Feb 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a reliable check, as the documents could end up in an updated state. This could occur if Kibana is restarted and a user resumes the reindex process in Upgrade Assistant, which actually kicks off the reindex again. As the code is here, we would actually throw an error when there was not.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

More info on the task response body here: https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-reindex.html#docs-reindex-api-response-body

// Check that no failures occurred
if (taskResponse.response?.failures?.length) {
// Include the entire task result in the error message. This should be guaranteed
// to be JSON-serializable since it just came back from Elasticsearch.
throw error.reindexTaskFailed(`Reindexing failed: ${JSON.stringify(taskResponse)}`);
Expand Down