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

Fix limit check for listing S3 objects #12018

Merged
merged 2 commits into from
Jan 25, 2024

Conversation

BhumikaSaini-Amazon
Copy link
Contributor

Description

Minor bugfix that ensures the right boundary value is checked while pulling objects from S3 remote store. Existing logic checks totalObjects > limit, which could lead to extra S3 calls if the next page needs to be fetched to breach this condition. This is unnecessary if we have already hit limit with the current pages. This further ensures we don't make additional S3 calls down the pipeline when we consume the results.

Related Issues

N/A

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

❌ Gradle check result for a752ab2: 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 Jan 25, 2024

Compatibility status:

Checks if related components are compatible with change b83f2e0

Incompatible components

Incompatible components: [https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/performance-analyzer-rca.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/alerting.git]

Signed-off-by: Bhumika Saini <[email protected]>
Copy link
Contributor

✅ Gradle check result for b83f2e0: SUCCESS

Copy link

codecov bot commented Jan 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b4306b6) 71.33% compared to head (b83f2e0) 71.35%.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #12018      +/-   ##
============================================
+ Coverage     71.33%   71.35%   +0.01%     
+ Complexity    59461    59459       -2     
============================================
  Files          4925     4925              
  Lines        279458   279458              
  Branches      40631    40631              
============================================
+ Hits         199342   199394      +52     
+ Misses        63486    63465      -21     
+ Partials      16630    16599      -31     

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

@sachinpkale sachinpkale merged commit e017a9c into opensearch-project:main Jan 25, 2024
31 of 33 checks passed
@sachinpkale sachinpkale added the backport 2.x Backport to 2.x branch label Jan 25, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 25, 2024
* Fix limit check for listing S3 objects

Signed-off-by: Bhumika Saini <[email protected]>

* Apply spotless fix

Signed-off-by: Bhumika Saini <[email protected]>

---------

Signed-off-by: Bhumika Saini <[email protected]>
(cherry picked from commit e017a9c)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
andrross pushed a commit that referenced this pull request Jan 25, 2024
* Fix limit check for listing S3 objects



* Apply spotless fix



---------


(cherry picked from commit e017a9c)

Signed-off-by: Bhumika Saini <[email protected]>
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>
peteralfonsi pushed a commit to peteralfonsi/OpenSearch that referenced this pull request Mar 1, 2024
* Fix limit check for listing S3 objects

Signed-off-by: Bhumika Saini <[email protected]>

* Apply spotless fix

Signed-off-by: Bhumika Saini <[email protected]>

---------

Signed-off-by: Bhumika Saini <[email protected]>
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
* Fix limit check for listing S3 objects

Signed-off-by: Bhumika Saini <[email protected]>

* Apply spotless fix

Signed-off-by: Bhumika Saini <[email protected]>

---------

Signed-off-by: Bhumika Saini <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
* Fix limit check for listing S3 objects

Signed-off-by: Bhumika Saini <[email protected]>

* Apply spotless fix

Signed-off-by: Bhumika Saini <[email protected]>

---------

Signed-off-by: Bhumika Saini <[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 skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants