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

Add remote path settings to RemoteStoreSettings class #13225

Merged

Conversation

ashking94
Copy link
Member

Description

This is a follow up PR from #13155 (comment). In this PR, we have moved 2 settings - cluster.remote_store.index.path.type and cluster.remote_store.index.path.hash_algorithm to the RemoteStoreSettings class.

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.

@ashking94 ashking94 changed the title Add remote path settings to RemoteStoreSettings Add remote path settings to RemoteStoreSettings class Apr 16, 2024
@ashking94 ashking94 marked this pull request as ready for review April 16, 2024 13:02
Copy link
Contributor

✅ Gradle check result for ed21977: SUCCESS

@sachinpkale
Copy link
Member

Changes look good. Branch has multiple conflicts with main, most probably due to recent revert of: #13155

@ashking94
Copy link
Member Author

@sachinpkale adding the reverted changes back as part of #13251. Once that is merged back, we should be good with the conflict part.

Signed-off-by: Ashish Singh <ssashish@amazon.com>
@ashking94
Copy link
Member Author

Detect breaking changes is failing due to refactoring of some methods that are present in only main branch as of now and yet to be released.

***! MODIFIED CLASS: PUBLIC org.opensearch.indices.IndicesService  (not serializable)
	===  CLASS FILE FORMAT VERSION: 55.0 <- 55.0
	---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) org.opensearch.common.settings.Setting<org.opensearch.index.remote.RemoteStoreEnums$PathHashAlgorithm> CLUSTER_REMOTE_STORE_PATH_HASH_ALGORITHM_SETTING
	---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) org.opensearch.common.settings.Setting<org.opensearch.index.remote.RemoteStoreEnums$PathType> CLUSTER_REMOTE_STORE_PATH_TYPE_SETTING
***  MODIFIED CLASS: PUBLIC org.opensearch.indices.RemoteStoreSettings  (not serializable)
	===  CLASS FILE FORMAT VERSION: 55.0 <- 55.0
	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) org.opensearch.common.settings.Setting<org.opensearch.index.remote.RemoteStoreEnums$PathHashAlgorithm> CLUSTER_REMOTE_STORE_PATH_HASH_ALGORITHM_SETTING
	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) org.opensearch.common.settings.Setting<org.opensearch.index.remote.RemoteStoreEnums$PathType> CLUSTER_REMOTE_STORE_PATH_TYPE_SETTING
	+++  NEW METHOD: PUBLIC(+) org.opensearch.index.remote.RemoteStoreEnums$PathHashAlgorithm getPathHashAlgorithm()
	+++  NEW METHOD: PUBLIC(+) org.opensearch.index.remote.RemoteStoreEnums$PathType getPathType()

We should ignore the "Detect breaking failure" changes here. cc @sachinpkale

@ashking94 ashking94 force-pushed the remote-store-settings-followup branch from ed21977 to 61a0532 Compare April 17, 2024 09:26
Copy link
Contributor

❕ Gradle check result for 61a0532: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testNonZeroPrimaryStatsOnNewlyCreatedIndexWithZeroDocs
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testDownloadStatsCorrectnessSinglePrimaryMultipleReplicaShards

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

Copy link

codecov bot commented Apr 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.45%. Comparing base (b15cb0c) to head (61a0532).
Report is 186 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13225      +/-   ##
============================================
+ Coverage     71.42%   71.45%   +0.03%     
- Complexity    59978    60679     +701     
============================================
  Files          4985     5040      +55     
  Lines        282275   285456    +3181     
  Branches      40946    41338     +392     
============================================
+ Hits         201603   203975    +2372     
- Misses        63999    64662     +663     
- Partials      16673    16819     +146     

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

@ashking94
Copy link
Member Author

❕ Gradle check result for 61a0532: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testNonZeroPrimaryStatsOnNewlyCreatedIndexWithZeroDocs
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testDownloadStatsCorrectnessSinglePrimaryMultipleReplicaShards

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

Flaky tests - #10983 and #10152

@sachinpkale
Copy link
Member

Detect breaking changes is failing due to refactoring of some methods that are present in only main branch as of now and yet to be released.

***! MODIFIED CLASS: PUBLIC org.opensearch.indices.IndicesService  (not serializable)
	===  CLASS FILE FORMAT VERSION: 55.0 <- 55.0
	---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) org.opensearch.common.settings.Setting<org.opensearch.index.remote.RemoteStoreEnums$PathHashAlgorithm> CLUSTER_REMOTE_STORE_PATH_HASH_ALGORITHM_SETTING
	---! REMOVED FIELD: PUBLIC(-) STATIC(-) FINAL(-) org.opensearch.common.settings.Setting<org.opensearch.index.remote.RemoteStoreEnums$PathType> CLUSTER_REMOTE_STORE_PATH_TYPE_SETTING
***  MODIFIED CLASS: PUBLIC org.opensearch.indices.RemoteStoreSettings  (not serializable)
	===  CLASS FILE FORMAT VERSION: 55.0 <- 55.0
	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) org.opensearch.common.settings.Setting<org.opensearch.index.remote.RemoteStoreEnums$PathHashAlgorithm> CLUSTER_REMOTE_STORE_PATH_HASH_ALGORITHM_SETTING
	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) org.opensearch.common.settings.Setting<org.opensearch.index.remote.RemoteStoreEnums$PathType> CLUSTER_REMOTE_STORE_PATH_TYPE_SETTING
	+++  NEW METHOD: PUBLIC(+) org.opensearch.index.remote.RemoteStoreEnums$PathHashAlgorithm getPathHashAlgorithm()
	+++  NEW METHOD: PUBLIC(+) org.opensearch.index.remote.RemoteStoreEnums$PathType getPathType()

We should ignore the "Detect breaking failure" changes here. cc @sachinpkale

Thanks for adding these details.

@sachinpkale sachinpkale merged commit 9c35a84 into opensearch-project:main Apr 17, 2024
28 of 29 checks passed
ashking94 added a commit to ashking94/OpenSearch that referenced this pull request Apr 23, 2024
…3225)

Signed-off-by: Ashish Singh <ssashish@amazon.com>
@ashking94 ashking94 added the backport 2.x Backport to 2.x branch label Apr 28, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 28, 2024
Signed-off-by: Ashish Singh <ssashish@amazon.com>
(cherry picked from commit 9c35a84)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
sachinpkale pushed a commit that referenced this pull request Apr 28, 2024
(cherry picked from commit 9c35a84)

Signed-off-by: Ashish Singh <ssashish@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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 skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants