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.

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

Force merge API supports performing only on primary shards #11269

Merged
merged 21 commits into from
Mar 12, 2024

Conversation

gaobinlong
Copy link
Collaborator

@gaobinlong gaobinlong commented Nov 20, 2023

Description

This is an enhancement for the force merge API, add a new url path parameter primary_only for that API, if the parameter is true, then the force merge operation will only perform on the primary shards of the specified indices, the default value of the parameter is false.

Related Issues

#8021

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.

Signed-off-by: Gao Binlong <[email protected]>
Copy link
Contributor

github-actions bot commented Nov 20, 2023

Compatibility status:

Checks if related components are compatible with change 028d1b1

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/flow-framework.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/performance-analyzer.git]

Copy link
Contributor

github-actions bot commented Mar 7, 2024

✅ Gradle check result for 1704781: SUCCESS

@gaobinlong
Copy link
Collaborator Author

@sohami @Bukhtawar I've added a new test case testReplicationAfterForceMergeOnPrimaryShardsOnly in SegmentReplicationIT, please help to review, thanks!

Copy link
Contributor

✅ Gradle check result for 37bf120: SUCCESS

@sohami sohami requested a review from Bukhtawar March 11, 2024 18:27
@sohami
Copy link
Collaborator

sohami commented Mar 12, 2024

@gaobinlong There is a conflict in CHANGELOG.md :( . Can you please help resolve that ? Thanks for your patience here!

Signed-off-by: Gao Binlong <[email protected]>
Copy link
Contributor

❕ Gradle check result for 028d1b1: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testMultiGetWithNetworkDisruption_FailOpenEnabled

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

@sohami
Copy link
Collaborator

sohami commented Mar 12, 2024

❕ Gradle check result for 028d1b1: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testMultiGetWithNetworkDisruption_FailOpenEnabled

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

Related to #10755

@sohami sohami merged commit e6eec36 into opensearch-project:main Mar 12, 2024
29 of 30 checks passed
@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-11269-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e6eec36ccbdea99e7832d1b6a9c014d2cee1940a
# Push it to GitHub
git push --set-upstream origin backport/backport-11269-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-11269-to-2.x.

@sohami
Copy link
Collaborator

sohami commented Mar 12, 2024

@gaobinlong Can you please manually create a backport PR for this ?

gaobinlong added a commit to gaobinlong/OpenSearch that referenced this pull request Mar 12, 2024
…h-project#11269)

* Force merge API supports performing on primary shards only

Signed-off-by: Gao Binlong <[email protected]>

* Modify change log

Signed-off-by: Gao Binlong <[email protected]>

* Fix test failure

Signed-off-by: Gao Binlong <[email protected]>

* Fix typo

Signed-off-by: Gao Binlong <[email protected]>

* Modify skip version

Signed-off-by: Gao Binlong <[email protected]>

* Add version check and more tests

Signed-off-by: Gao Binlong <[email protected]>

* Format code

Signed-off-by: Gao Binlong <[email protected]>

* Modify supported version and add more test

Signed-off-by: Gao Binlong <[email protected]>

* Change the supported version to 3.0.0

Signed-off-by: Gao Binlong <[email protected]>

* Add test case in SegmentReplicationIT

Signed-off-by: Gao Binlong <[email protected]>

* Optimize the test code

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
(cherry picked from commit e6eec36)
sohami pushed a commit that referenced this pull request Mar 13, 2024
…ards (#11269) (#12609)

* Force merge API supports performing only on primary shards (#11269)

* Force merge API supports performing on primary shards only

Signed-off-by: Gao Binlong <[email protected]>

* Modify change log

Signed-off-by: Gao Binlong <[email protected]>

* Fix test failure

Signed-off-by: Gao Binlong <[email protected]>

* Fix typo

Signed-off-by: Gao Binlong <[email protected]>

* Modify skip version

Signed-off-by: Gao Binlong <[email protected]>

* Add version check and more tests

Signed-off-by: Gao Binlong <[email protected]>

* Format code

Signed-off-by: Gao Binlong <[email protected]>

* Modify supported version and add more test

Signed-off-by: Gao Binlong <[email protected]>

* Change the supported version to 3.0.0

Signed-off-by: Gao Binlong <[email protected]>

* Add test case in SegmentReplicationIT

Signed-off-by: Gao Binlong <[email protected]>

* Optimize the test code

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
(cherry picked from commit e6eec36)

* Modify supported version to 2.13.0

Signed-off-by: Gao Binlong <[email protected]>

* Fix test failure

Signed-off-by: Gao Binlong <[email protected]>

* Fix yml test failure

Signed-off-by: Gao Binlong <[email protected]>

* Fix yaml test failure

Signed-off-by: Gao Binlong <[email protected]>

* Fix typo and test failure

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
@sohami sohami added the documentation pending Tracks issues which have PRs merged but documentation changes pending label Mar 13, 2024
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
…h-project#11269)

* Force merge API supports performing on primary shards only

Signed-off-by: Gao Binlong <[email protected]>

* Modify change log

Signed-off-by: Gao Binlong <[email protected]>

* Fix test failure

Signed-off-by: Gao Binlong <[email protected]>

* Fix typo

Signed-off-by: Gao Binlong <[email protected]>

* Modify skip version

Signed-off-by: Gao Binlong <[email protected]>

* Add version check and more tests

Signed-off-by: Gao Binlong <[email protected]>

* Format code

Signed-off-by: Gao Binlong <[email protected]>

* Modify supported version and add more test

Signed-off-by: Gao Binlong <[email protected]>

* Change the supported version to 3.0.0

Signed-off-by: Gao Binlong <[email protected]>

* Add test case in SegmentReplicationIT

Signed-off-by: Gao Binlong <[email protected]>

* Optimize the test code

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…h-project#11269)

* Force merge API supports performing on primary shards only

Signed-off-by: Gao Binlong <[email protected]>

* Modify change log

Signed-off-by: Gao Binlong <[email protected]>

* Fix test failure

Signed-off-by: Gao Binlong <[email protected]>

* Fix typo

Signed-off-by: Gao Binlong <[email protected]>

* Modify skip version

Signed-off-by: Gao Binlong <[email protected]>

* Add version check and more tests

Signed-off-by: Gao Binlong <[email protected]>

* Format code

Signed-off-by: Gao Binlong <[email protected]>

* Modify supported version and add more test

Signed-off-by: Gao Binlong <[email protected]>

* Change the supported version to 3.0.0

Signed-off-by: Gao Binlong <[email protected]>

* Add test case in SegmentReplicationIT

Signed-off-by: Gao Binlong <[email protected]>

* Optimize the test code

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport-failed documentation pending Tracks issues which have PRs merged but documentation changes pending
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants