Skip to content

Remove deprecated settings to defer cluster recovery#17357

Merged
andrross merged 1 commit intoopensearch-project:mainfrom
andrross:remove-deprecated-gateway-settings
Feb 14, 2025
Merged

Remove deprecated settings to defer cluster recovery#17357
andrross merged 1 commit intoopensearch-project:mainfrom
andrross:remove-deprecated-gateway-settings

Conversation

@andrross
Copy link
Copy Markdown
Member

@andrross andrross commented Feb 14, 2025

The following settings were deprecated in ES 7.7 prior to the fork:

  • gateway.expected_nodes
  • gateway.expected_master_nodes
  • gateway.recover_after_nodes
  • gateway.recover_after_master_nodes

This commit removes the deprecated settings and replaces their usages in tests with expected_data_nodes or recover_after_data_nodes.

Related Issues

Resolves #3117

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

The following settings were deprecated in ES 7.7 prior to the fork:

- gateway.expected_nodes
- gateway.expected_master_nodes
- gateway.recover_after_nodes
- gateway.recover_after_master_nodes

This commit removes the deprecated settings and replaces their usages
in tests with `recover_after_data_nodes`.

Signed-off-by: Andrew Ross <andrross@amazon.com>
@github-actions
Copy link
Copy Markdown
Contributor

❕ Gradle check result for 34e05f6: 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.

@andrross andrross force-pushed the remove-deprecated-gateway-settings branch from 34e05f6 to 99b25aa Compare February 14, 2025 01:07
@andrross andrross added the v3.0.0 Issues and PRs related to version 3.0.0 label Feb 14, 2025
@github-actions
Copy link
Copy Markdown
Contributor

✅ Gradle check result for 99b25aa: SUCCESS

@codecov
Copy link
Copy Markdown

codecov bot commented Feb 14, 2025

Codecov Report

Attention: Patch coverage is 33.33333% with 2 lines in your changes missing coverage. Please review.

Project coverage is 72.37%. Comparing base (38e4b33) to head (99b25aa).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
...in/java/org/opensearch/gateway/GatewayService.java 33.33% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #17357      +/-   ##
============================================
- Coverage     72.41%   72.37%   -0.04%     
+ Complexity    65569    65530      -39     
============================================
  Files          5291     5291              
  Lines        304338   304312      -26     
  Branches      44181    44176       -5     
============================================
- Hits         220376   220238     -138     
- Misses        65917    66001      +84     
- Partials      18045    18073      +28     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@andrross andrross merged commit 2d2b41d into opensearch-project:main Feb 14, 2025
34 of 35 checks passed
@andrross andrross deleted the remove-deprecated-gateway-settings branch February 14, 2025 17:02
bugfood added a commit to bugfood/puppet-opensearch that referenced this pull request Feb 9, 2026
Compare:
https://docs.opensearch.org/3.2/install-and-configure/configuring-opensearch/discovery-gateway-settings/
To:
https://docs.opensearch.org/3.3/install-and-configure/configuring-opensearch/discovery-gateway-settings/

gateway.recover_after_nodes is now gone, probably due to:
opensearch-project/OpenSearch#17357

The value of 0 here is documented to have been the default in 3.2 (and
presumably earlier versions).

This option may be replaceable by gateway.recover_after_data_nodes.
Don't configure that as a default within puppet-opensearch, though;
we don't need to mirror every upstream default here (indeed, the other
gateway options are already unspecified).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Cluster Manager deprecate enhancement Enhancement or improvement to existing feature or request v3.0.0 Issues and PRs related to version 3.0.0

Projects

Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

Remove deprecated 'gateway' settings used to defer cluster recovery pending a certain number of master nodes

2 participants