-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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 support for async deletion in S3BlobContainer #15621
Add support for async deletion in S3BlobContainer #15621
Conversation
Signed-off-by: Ashish Singh <ssashish@amazon.com>
plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
Show resolved
Hide resolved
plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
Outdated
Show resolved
Hide resolved
❌ Gradle check result for 7822739: 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? |
…epository Signed-off-by: Ashish Singh <ssashish@amazon.com>
❕ Gradle check result for 639257a: 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. |
plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
Show resolved
Hide resolved
plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
Show resolved
Hide resolved
plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
Show resolved
Hide resolved
Signed-off-by: Ashish Singh <ssashish@amazon.com>
❌ Gradle check result for 1f5a9cb: 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? |
plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3AsyncDeleteHelper.java
Outdated
Show resolved
Hide resolved
plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3AsyncDeleteHelper.java
Outdated
Show resolved
Hide resolved
plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
Show resolved
Hide resolved
plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
Show resolved
Hide resolved
…epository Signed-off-by: Ashish Singh <ssashish@amazon.com>
Signed-off-by: Ashish Singh <ssashish@amazon.com>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #15621 +/- ##
============================================
- Coverage 71.90% 71.88% -0.02%
+ Complexity 64392 64333 -59
============================================
Files 5278 5281 +3
Lines 300877 301004 +127
Branches 43478 43486 +8
============================================
+ Hits 216351 216387 +36
- Misses 66747 66873 +126
+ Partials 17779 17744 -35 ☔ View full report in Codecov by Sentry. |
5013993
to
69f66d1
Compare
❕ Gradle check result for 90548d2: 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. |
1fcdf52
to
59b9c64
Compare
Signed-off-by: Ashish Singh <ssashish@amazon.com>
08154aa
to
96cd6f7
Compare
❌ Gradle check result for 96cd6f7: 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? |
|
❕ Gradle check result for 96cd6f7: 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. |
plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
Show resolved
Hide resolved
…epository Signed-off-by: Ashish Singh <ssashish@amazon.com>
The backport to
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-15621-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2b670cc11f52ada701cbf867ce8ad4527d8b6072
# Push it to GitHub
git push --set-upstream origin backport/backport-15621-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 |
…#15621) * Add support for async deletion in S3BlobContainer Signed-off-by: Ashish Singh <ssashish@amazon.com> * Move helper methods to helper class Signed-off-by: Ashish Singh <ssashish@amazon.com> * Minor refactor Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add UTs Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add more tests Signed-off-by: Ashish Singh <ssashish@amazon.com> * Integrate async deletion in the snapshot interactions Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com>
* Add support for async deletion in S3BlobContainer * Move helper methods to helper class * Minor refactor * Add UTs * Add more tests * Integrate async deletion in the snapshot interactions --------- Signed-off-by: Ashish Singh <ssashish@amazon.com>
…#15621) * Add support for async deletion in S3BlobContainer Signed-off-by: Ashish Singh <ssashish@amazon.com> * Move helper methods to helper class Signed-off-by: Ashish Singh <ssashish@amazon.com> * Minor refactor Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add UTs Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add more tests Signed-off-by: Ashish Singh <ssashish@amazon.com> * Integrate async deletion in the snapshot interactions Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com>
…#15621) * Add support for async deletion in S3BlobContainer Signed-off-by: Ashish Singh <ssashish@amazon.com> * Move helper methods to helper class Signed-off-by: Ashish Singh <ssashish@amazon.com> * Minor refactor Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add UTs Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add more tests Signed-off-by: Ashish Singh <ssashish@amazon.com> * Integrate async deletion in the snapshot interactions Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com>
…#15621) * Add support for async deletion in S3BlobContainer Signed-off-by: Ashish Singh <ssashish@amazon.com> * Move helper methods to helper class Signed-off-by: Ashish Singh <ssashish@amazon.com> * Minor refactor Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add UTs Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add more tests Signed-off-by: Ashish Singh <ssashish@amazon.com> * Integrate async deletion in the snapshot interactions Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com>
…#15621) * Add support for async deletion in S3BlobContainer Signed-off-by: Ashish Singh <ssashish@amazon.com> * Move helper methods to helper class Signed-off-by: Ashish Singh <ssashish@amazon.com> * Minor refactor Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add UTs Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add more tests Signed-off-by: Ashish Singh <ssashish@amazon.com> * Integrate async deletion in the snapshot interactions Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com>
…#15621) * Add support for async deletion in S3BlobContainer Signed-off-by: Ashish Singh <ssashish@amazon.com> * Move helper methods to helper class Signed-off-by: Ashish Singh <ssashish@amazon.com> * Minor refactor Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add UTs Signed-off-by: Ashish Singh <ssashish@amazon.com> * Add more tests Signed-off-by: Ashish Singh <ssashish@amazon.com> * Integrate async deletion in the snapshot interactions Signed-off-by: Ashish Singh <ssashish@amazon.com> --------- Signed-off-by: Ashish Singh <ssashish@amazon.com>
Description
In this PR, we are introducing the deletion using the S3 asyc client for repository-s3. We have also added a setting to control the async deletion in Snapshot code with default being false. We have also added multiple tests around the new code to ensure we are handling the edge cases.
Check List
[ ] 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.