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

Jump to bottom

Fix for stuck update action in a bulk with retry_on_conflict property #11153

Merged
merged 3 commits into from
Nov 23, 2023
Merged

Fix for stuck update action in a bulk with retry_on_conflict property #11153

merged 3 commits into from
Nov 23, 2023

Conversation

raghuvanshraj
Copy link
Contributor

@raghuvanshraj raghuvanshraj commented Nov 10, 2023 •
edited
Loading

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 includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

By 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.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 10, 2023 •
edited
Loading

Compatibility status:

Checks if related components are compatible with change 6356185

Incompatible components

Skipped components

Compatible components

Compatible 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]

@github-actions GitHub Actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testMultiGetWithNetworkDisruption_FailOpenEnabled

@codecov Codecov
Copy link

codecov bot commented Nov 10, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b974dfb) 71.27% compared to head (6356185) 71.39%.
Report is 3 commits behind head on main.

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.
📢 Have feedback on the report? Share it here.

@raghuvanshraj raghuvanshraj marked this pull request as ready for review November 10, 2023 02:43
@github-actions GitHub Actions
Copy link
Contributor

❌ 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?

@github-actions GitHub Actions
Copy link
Contributor

✅ Gradle check result for bb1a6cd: SUCCESS

@raghuvanshraj
Bugfix for update staying stuck when sent as part of bulk with retry_…
b3fa324 
…on_conflict specified

Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>
@raghuvanshraj
Addressed comments on CHANGELOG
eb5def5 
Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>
@github-actions GitHub Actions
Copy link
Contributor

❌ 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?

@github-actions GitHub Actions
Copy link
Contributor

❌ 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?

shwetathareja
shwetathareja reviewed Nov 23, 2023
View reviewed changes
Copy link
Member

@shwetathareja shwetathareja left a 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.

CHANGELOG.md Outdated Show resolved Hide resolved
@raghuvanshraj
Added multiple items in UT with different retry counts and item level…
6356185 
… retry assertion

Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>
@github-actions GitHub Actions
Copy link
Contributor

❕ Gradle check result for 6356185: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString_FailOpenEnabled
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testNonZeroPrimaryStatsOnNewlyCreatedIndexWithZeroDocs

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@shwetathareja shwetathareja merged commit fe2d585 into opensearch-project:main Nov 23, 2023
29 checks passed
@shwetathareja shwetathareja added the backport 2.x Backport to 2.x branch label Nov 23, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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 base branch is 2.x and the compare/head branch is backport/backport-11153-to-2.x.

fahadshamiinsta pushed a commit to fahadshamiinsta/OpenSearch270 that referenced this pull request Dec 4, 2023
@raghuvanshraj @fahadshamiinsta
Fix for stuck update action in a bulk with retry_on_conflict property (…
dbad60e 
…opensearch-project#11153)

* Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified

Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>
@sarthakaggarwal97
Copy link
Contributor

@raghuvanshraj can you please raise a manual backport for 2.x? thank you

raghuvanshraj added a commit to raghuvanshraj/OpenSearch that referenced this pull request Dec 5, 2023
@raghuvanshraj
Fix for stuck update action in a bulk with retry_on_conflict property (…
c166447 
…opensearch-project#11153)

* Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified

Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>
raghuvanshraj added a commit to raghuvanshraj/OpenSearch that referenced this pull request Dec 5, 2023
@raghuvanshraj
Fix for stuck update action in a bulk with retry_on_conflict property (…
d0ac373 
…opensearch-project#11153)

* Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified

Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>
@raghuvanshraj raghuvanshraj mentioned this pull request Dec 5, 2023
Merged
reta pushed a commit that referenced this pull request Dec 7, 2023
@raghuvanshraj
Fix for stuck update action in a bulk with retry_on_conflict property (…
978dcd5 
…#11153) (#11466)

* Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified

Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>
deshsidd pushed a commit to deshsidd/OpenSearch that referenced this pull request Dec 11, 2023
@raghuvanshraj @deshsidd
Fix for stuck update action in a bulk with retry_on_conflict property (…
0dabe69 
…opensearch-project#11153)

* Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified

Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
@raghuvanshraj @rayshrey
Fix for stuck update action in a bulk with retry_on_conflict property (…
6b87b3b 
…opensearch-project#11153)

* Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified

Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
@raghuvanshraj @shiv0408
Fix for stuck update action in a bulk with retry_on_conflict property (…
41f688c 
…opensearch-project#11153)

* Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified

Signed-off-by: Raghuvansh Raj <raghraaj@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shwetathareja shwetathareja shwetathareja approved these changes

@sarthakaggarwal97 sarthakaggarwal97 sarthakaggarwal97 approved these changes

@mgodwan mgodwan mgodwan approved these changes

@abbashus abbashus Awaiting requested review from abbashus

@adnapibar adnapibar Awaiting requested review from adnapibar

@anasalkouz anasalkouz Awaiting requested review from anasalkouz anasalkouz is a code owner

@andrross andrross Awaiting requested review from andrross andrross is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE CEHENKLE is a code owner

@dblock dblock Awaiting requested review from dblock dblock is a code owner

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@dreamer-89 dreamer-89 Awaiting requested review from dreamer-89

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@kartg kartg Awaiting requested review from kartg

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@nknize nknize Awaiting requested review from nknize nknize is a code owner

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@peternied peternied Awaiting requested review from peternied

@reta reta Awaiting requested review from reta reta is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159 Rishikesh1159 is a code owner

@ryanbogan ryanbogan Awaiting requested review from ryanbogan

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@setiah setiah Awaiting requested review from setiah

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@tlfeng tlfeng Awaiting requested review from tlfeng

@VachaShah VachaShah Awaiting requested review from VachaShah VachaShah is a code owner

Assignees
No one assigned
Labels
backport 2.x Backport to 2.x branch backport-failed Indexing Indexing, Bulk Indexing and anything related to indexing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@raghuvanshraj @sarthakaggarwal97 @shwetathareja @andrross @mgodwan