-
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
Updating the separator for RemoteStoreLockManager since underscore is allowed in base64UUID url charset #10379
Conversation
Gradle Check (Jenkins) Run Completed with:
|
Compatibility status:Checks if related components are compatible with change b8adac0 Incompatible componentsSkipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git] |
server/src/test/java/org/opensearch/index/store/lockmanager/FileLockInfoTests.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreLockManagerUtils.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/index/store/lockmanager/FileLockInfo.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/index/store/lockmanager/FileLockInfo.java
Outdated
Show resolved
Hide resolved
56ff047
to
6fe4ce7
Compare
Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com>
Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com>
Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com>
bda47d6
to
ef55857
Compare
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com>
Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Merging as gradle check passed and pre-commit was successful locally as well. |
… allowed in base64UUID url charset (#10379) * Refactor Remote Store Metadata Lock Manager Utils Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Unmute testDeleteShallowCopySnapshot test Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> --------- Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> Co-authored-by: Harish Bhakuni <hbhakuni@amazon.com> (cherry picked from commit 66aef13) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
… allowed in base64UUID url charset (#10379) (#10421) * Refactor Remote Store Metadata Lock Manager Utils * Address PR Comments * Address PR Comments * Update Changelog entry * Update Changelog entry * Unmute testDeleteShallowCopySnapshot test --------- (cherry picked from commit 66aef13) Signed-off-by: Harish Bhakuni <hbhakuni@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> Co-authored-by: Harish Bhakuni <hbhakuni@amazon.com>
… allowed in base64UUID url charset (#10379) * Refactor Remote Store Metadata Lock Manager Utils Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Unmute testDeleteShallowCopySnapshot test Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> --------- Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> Co-authored-by: Harish Bhakuni <hbhakuni@amazon.com> (cherry picked from commit 66aef13) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
… allowed in base64UUID url charset (#10379) (#10428) * Refactor Remote Store Metadata Lock Manager Utils * Address PR Comments * Address PR Comments * Update Changelog entry * Update Changelog entry * Unmute testDeleteShallowCopySnapshot test --------- (cherry picked from commit 66aef13) Signed-off-by: Harish Bhakuni <hbhakuni@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> Co-authored-by: Harish Bhakuni <hbhakuni@amazon.com>
… allowed in base64UUID url charset (opensearch-project#10379) * Refactor Remote Store Metadata Lock Manager Utils Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Unmute testDeleteShallowCopySnapshot test Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> --------- Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> Co-authored-by: Harish Bhakuni <hbhakuni@amazon.com>
… allowed in base64UUID url charset (opensearch-project#10379) * Refactor Remote Store Metadata Lock Manager Utils Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Unmute testDeleteShallowCopySnapshot test Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> --------- Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> Co-authored-by: Harish Bhakuni <hbhakuni@amazon.com>
… allowed in base64UUID url charset (opensearch-project#10379) * Refactor Remote Store Metadata Lock Manager Utils Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Unmute testDeleteShallowCopySnapshot test Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> --------- Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> Co-authored-by: Harish Bhakuni <hbhakuni@amazon.com>
… allowed in base64UUID url charset (opensearch-project#10379) * Refactor Remote Store Metadata Lock Manager Utils Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Address PR Comments Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Update Changelog entry Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> * Unmute testDeleteShallowCopySnapshot test Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> --------- Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com> Co-authored-by: Harish Bhakuni <hbhakuni@amazon.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Description
We are using URL Safe Base64UUID in most of the places in code which can have '__' as one of the characters. For Remote Store Metadata Lock files, Keeping '___' (triple underscores) as separator to separate out snapshot UUID and remote store metadata name would not work because if either the Metadata or the Snapshot UUID starts or ends will '', we cannot use our separator to separate out the fields.
To Fix this, as part of this PR I am updating the separator to "..." for new lock files. We will still support reading older lock files for backward compatibility, but we will do best effort by pulling out the snapshotID from the end first and then getting the md file.
Related Issues
Resolves #9115
Check List
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.