-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.
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
Fix for stuck update action in a bulk with retry_on_conflict property #11153
Fix for stuck update action in a bulk with retry_on_conflict property #11153
Conversation
Compatibility status:Checks if related components are compatible with change 6356185 Incompatible componentsSkipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/performance-analyzer.git] |
Gradle Check (Jenkins) Run Completed with:
|
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #11153 +/- ##
============================================
+ Coverage 71.27% 71.39% +0.12%
- Complexity 58932 58997 +65
============================================
Files 4890 4890
Lines 277421 277422 +1
Branches 40308 40308
============================================
+ Hits 197723 198074 +351
+ Misses 63250 62878 -372
- Partials 16448 16470 +22 ☔ View full report in Codecov by Sentry. |
dfb77a9
to
15a6fe5
Compare
❌ Gradle check result for 15a6fe5: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
15a6fe5
to
bb1a6cd
Compare
…on_conflict specified Signed-off-by: Raghuvansh Raj <[email protected]>
Signed-off-by: Raghuvansh Raj <[email protected]>
bb1a6cd
to
49b60f7
Compare
❌ Gradle check result for 49b60f7: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
49b60f7
to
b635881
Compare
❌ Gradle check result for b635881: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor comment on changelog, else looks good. Thanks @raghuvanshraj for fixing the bug.
… retry assertion Signed-off-by: Raghuvansh Raj <[email protected]>
b635881
to
6356185
Compare
❕ Gradle check result for 6356185: UNSTABLE
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure. |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-11153-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fe2d58529aacc1270afc49693cc2be95b1b9ef6e
# Push it to GitHub
git push --set-upstream origin backport/backport-11153-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x Then, create a pull request where the |
…opensearch-project#11153) * Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified Signed-off-by: Raghuvansh Raj <[email protected]>
@raghuvanshraj can you please raise a manual backport for 2.x? thank you |
…opensearch-project#11153) * Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified Signed-off-by: Raghuvansh Raj <[email protected]>
…opensearch-project#11153) * Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified Signed-off-by: Raghuvansh Raj <[email protected]>
…#11153) (#11466) * Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified Signed-off-by: Raghuvansh Raj <[email protected]>
…opensearch-project#11153) * Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified Signed-off-by: Raghuvansh Raj <[email protected]>
…opensearch-project#11153) * Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified Signed-off-by: Raghuvansh Raj <[email protected]>
…opensearch-project#11153) * Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified Signed-off-by: Raghuvansh Raj <[email protected]> Signed-off-by: Shivansh Arora <[email protected]>
Description
When updates are sent as part of a bulk request, they can remain stuck in an infinite loop in a scenario where
VersionConflictEngineExceptions
are repeatedly thrown. This PR fixes that and adds a test case to detect the same.Related Issues
#11152
Check List
New functionality has been documented.New functionality has javadoc addedFailing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)Public documentation issue/PR createdBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.