Fix async enrich execution prematurely releases enrich policy lock #94702
Conversation
This file contains hidden or 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
jbaiera added >bug :Data Management/Ingest Node 
| Hi @jbaiera, I've created a changelog YAML for you. |
jbaiera commented Mar 23, 2023
x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyExecutor.java Show resolved Hide resolved
masseyke reviewed Mar 23, 2023
x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyExecutor.java Show resolved Hide resolved
elasticsearchmachine added the Team:Data Management | Pinging @elastic/es-data-management (Team:Data Management) |
masseyke reviewed Mar 27, 2023
...ck/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyExecutorTests.java Outdated Show resolved Hide resolved
masseyke reviewed Mar 27, 2023
...ck/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyExecutorTests.java Show resolved Hide resolved
💔 Backport failed
You can use sqren/backport to manually backport by running |
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
jbaiera added a commit to jbaiera/elasticsearch that referenced this pull request Mar 28, 2023
…lastic#94702) This PR ups the timeout on the EnrichExecutor's task API call and adds additional logic in the event that the task await call fails. Without this change, the task API call can timeout and unlock the policy prematurely. Premature unlocking can lead to the index being removed while the policy is executing. (cherry picked from commit f56fc01) # Conflicts: # x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyExecutor.java
jbaiera added a commit that referenced this pull request Mar 28, 2023
…94702) (#94837) This PR ups the timeout on the EnrichExecutor's task API call and adds additional logic in the event that the task await call fails. Without this change, the task API call can timeout and unlock the policy prematurely. Premature unlocking can lead to the index being removed while the policy is executing. (cherry picked from commit f56fc01)
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
jbaiera added a commit to jbaiera/elasticsearch that referenced this pull request Mar 28, 2023
…lastic#94702) This PR ups the timeout on the EnrichExecutor's task API call and adds additional logic in the event that the task await call fails. Without this change, the task API call can timeout and unlock the policy prematurely. Premature unlocking can lead to the index being removed while the policy is executing. (cherry picked from commit f56fc01) # Conflicts: # x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyExecutor.java # x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyExecutorTests.java
jbaiera added a commit that referenced this pull request Mar 28, 2023
…94702) (#94841) This PR ups the timeout on the EnrichExecutor's task API call and adds additional logic in the event that the task await call fails. Without this change, the task API call can timeout and unlock the policy prematurely. Premature unlocking can lead to the index being removed while the policy is executing. (cherry picked from commit f56fc01) # Conflicts: # x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyExecutor.java # x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyExecutorTests.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
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.
When submitting an enrich policy execution with
wait_for_completion=false, the master node that services the request needs to wait on the remote task to complete so that it may unlock the policy for further runs. It currently does not set a timeout for the Get Task API call, which has a default timeout of 30 seconds. This is almost never enough time to cover an executing enrich policy. At the end of the timeout, the policy is unlocked without any further logic applied. This leaves the new enrich index that is under construction open to be deleted by the background maintenance task.This PR is a quick fix for the problem. It ups the timeout on the get task API and adds additional logic in the event that the task await call fails.
fixes #94690