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

Upgrade aws-sdk-java version to 2.20.86 #12251

Merged
merged 3 commits into from
Mar 13, 2024

Conversation

sachinpkale
Copy link
Member

@sachinpkale sachinpkale commented Feb 8, 2024

Description

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.

Copy link
Contributor

github-actions bot commented Feb 8, 2024

❌ Gradle check result for e8672a7: 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?

Copy link
Contributor

github-actions bot commented Feb 8, 2024

Compatibility status:

Checks if related components are compatible with change 8f44cc4

Incompatible components

Incompatible components: [https:/opensearch-project/alerting.git, https:/opensearch-project/security-analytics.git]

Skipped components

Compatible components

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

@reta
Copy link
Collaborator

reta commented Feb 8, 2024

@sachinpkale could we go to the latest one? Or there are some quirks?

@sachinpkale
Copy link
Member Author

@sachinpkale could we go to the latest one? Or there are some quirks?

Ideally, yes. We should go with latest version but being a bit defensive here. 2.20.86 fixes both the mentioned issues and I verified the same in my testing as well.

Copy link
Collaborator

@Bukhtawar Bukhtawar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Sachin,
Can we look at what set of issues between this version (2.20.86) and latest could potentially impact us from the change log

Copy link
Contributor

github-actions bot commented Feb 9, 2024

❌ Gradle check result for 8e15173: 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?

@sachinpkale
Copy link
Member Author

Thanks Sachin, Can we look at what set of issues between this version (2.20.86) and latest could potentially impact us from the change log

Between 2.20.86 and latest version (2.25.6), there are 2292 commits.
aws/aws-sdk-java-v2@2.20.86...2.25.6

It would not be possible to understand how many of these are impacting OpenSearch interaction with the SDK but they could be significant. For example, 2.25.5 has a fix for S3 multipart client (https:/aws/aws-sdk-java-v2/releases/tag/2.25.5)

We can also setup dependabot to upgrade the version to latest (not changing the major version) one but not sure what kind of tests we need to add to make sure the new version does not break anything.

Copy link
Collaborator

@Bukhtawar Bukhtawar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me. we can decouple this PR and follow it up for latest version update espl with stream upload support on S3SDK

Copy link
Contributor

❌ Gradle check result for ec9ee26: 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?

Copy link
Contributor

❌ Gradle check result for 86c6df7: 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?

Sachin Kale added 3 commits March 13, 2024 10:02
Signed-off-by: Sachin Kale <[email protected]>
Signed-off-by: Sachin Kale <[email protected]>
Copy link
Contributor

✅ Gradle check result for 8f44cc4: SUCCESS

Copy link

codecov bot commented Mar 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.50%. Comparing base (b15cb0c) to head (8f44cc4).
Report is 15 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #12251      +/-   ##
============================================
+ Coverage     71.42%   71.50%   +0.08%     
- Complexity    59978    60060      +82     
============================================
  Files          4985     4985              
  Lines        282275   282395     +120     
  Branches      40946    40965      +19     
============================================
+ Hits         201603   201925     +322     
+ Misses        63999    63691     -308     
- Partials      16673    16779     +106     

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

@gbbafna gbbafna merged commit 07fab0f into opensearch-project:main Mar 13, 2024
21 of 30 checks passed
@gbbafna gbbafna deleted the sdk-version-upgrade branch March 13, 2024 07:21
@sachinpkale sachinpkale added the backport 2.x Backport to 2.x branch label Mar 13, 2024
@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-12251-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 07fab0f89ebe9007e04b2fdd775cba0b4a9ffae1
# Push it to GitHub
git push --set-upstream origin backport/backport-12251-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-12251-to-2.x.

sachinpkale added a commit to sachinpkale/OpenSearch that referenced this pull request Mar 14, 2024
* Upgrade aws-sdk version to 2.20.86

Signed-off-by: Sachin Kale <[email protected]>

* Update SHAs

Signed-off-by: Sachin Kale <[email protected]>
gbbafna pushed a commit that referenced this pull request Mar 14, 2024
* Upgrade aws-sdk version to 2.20.86



* Update SHAs

Signed-off-by: Sachin Kale <[email protected]>
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
* Upgrade aws-sdk version to 2.20.86

Signed-off-by: Sachin Kale <[email protected]>

* Update SHAs

Signed-off-by: Sachin Kale <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
* Upgrade aws-sdk version to 2.20.86

Signed-off-by: Sachin Kale <[email protected]>

* Update SHAs

Signed-off-by: Sachin Kale <[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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants