add archive restore retry on mapper parsing exception (6.1)
#21258
+51
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![graylog-internal-actions-access[bot]](https://avatars.githubusercontent.com/in/274774?s=60&v=4){kind=small}
* add restore retry on mapper parsing exception * add changelog * fix changelog * update changelog Co-authored-by: Patrick Mann <[email protected]> --------- Co-authored-by: Patrick Mann <[email protected]> (cherry picked from commit 7664ddf)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note: This is a backport of #21197 to
6.1.Description
Since this PR, we save the mapping in the
archive-metadata.jsonfile and use this mapping to create an index. The problem is that if a mapping contains field properties that reference a field from the index settings, this leads to an error. We have therefore started to also store the index settings in thearchive-metadata.jsonand apply them during index creation. This has been done in this PR. Unfortunately, there is still an error case for archives that do not contain any settings. For this scenario, this PR implements a retry with default mappings/settings if such an error occurs.Types of changes
companion PR:
/jenkins-pr-deps Graylog2/graylog-plugin-enterprise#9455