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 get task API does not refresh resource stats #11531

Merged
merged 4 commits into from
Feb 26, 2024

Conversation

gaobinlong
Copy link
Collaborator

@gaobinlong gaobinlong commented Dec 8, 2023

Description

List tasks API will refresh the resource stats for the tasks which support resource tracking, but get task API does not refresh the resource stats, this PR fix the bug and add some tests for it.

Related Issues

#8655

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.

Signed-off-by: Gao Binlong <[email protected]>
Copy link
Contributor

github-actions bot commented Dec 8, 2023

Compatibility status:

Checks if related components are compatible with change b57a5ef

Incompatible components

Skipped components

Compatible components

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

Copy link

codecov bot commented Dec 8, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.29%. Comparing base (f90baa2) to head (b57a5ef).

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #11531      +/-   ##
============================================
- Coverage     71.45%   71.29%   -0.16%     
+ Complexity    59895    59815      -80     
============================================
  Files          4972     4972              
  Lines        281781   281783       +2     
  Branches      40910    40910              
============================================
- Hits         201337   200909     -428     
- Misses        63757    64173     +416     
- Partials      16687    16701      +14     

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

Copy link
Contributor

github-actions bot commented Dec 8, 2023

✅ Gradle check result for f0cb5b7: SUCCESS

Signed-off-by: Gao Binlong <[email protected]>
Copy link
Contributor

❕ Gradle check result for dbc8d09: UNSTABLE

  • TEST FAILURES:
      2 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.classMethod
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshAfterCommit

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

@gaobinlong
Copy link
Collaborator Author

Could anyone help to review this PR? I think it's pretty straightforward.

@gaobinlong
Copy link
Collaborator Author

@jed326 , could you help to review this PR, thanks!

Copy link
Collaborator

@jed326 jed326 left a comment

Choose a reason for hiding this comment

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

LGTM, Thanks for opening this bug fix! @reta could you help provide a maintainer review here?

@opensearch-trigger-bot
Copy link
Contributor

This PR is stalled because it has been open for 30 days with no activity.

@opensearch-trigger-bot opensearch-trigger-bot bot added the stalled Issues that have stalled label Feb 20, 2024
@reta
Copy link
Collaborator

reta commented Feb 20, 2024

LGTM, Thanks for opening this bug fix! @reta could you help provide a maintainer review here?

Somehow lost this change, @gaobinlong it looks good, could you rebase + resolve conflicts? thank you

@opensearch-trigger-bot opensearch-trigger-bot bot removed the stalled Issues that have stalled label Feb 21, 2024
Signed-off-by: Gao Binlong <[email protected]>
Copy link
Contributor

✅ Gradle check result for b57a5ef: SUCCESS

@gaobinlong
Copy link
Collaborator Author

LGTM, Thanks for opening this bug fix! @reta could you help provide a maintainer review here?

Somehow lost this change, @gaobinlong it looks good, could you rebase + resolve conflicts? thank you

Thanks @reta, I've done that and now all gradle checks have passed yet.

@reta reta merged commit 8d84eea into opensearch-project:main Feb 26, 2024
30 checks passed
@reta reta added bug Something isn't working backport 2.x Backport to 2.x branch labels Feb 26, 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-11531-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8d84eea68d9ed7dedcccc8161569d5b4d2ee4eec
# Push it to GitHub
git push --set-upstream origin backport/backport-11531-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-11531-to-2.x.

@reta
Copy link
Collaborator

reta commented Feb 26, 2024

@gaobinlong mind please backporting to 2.x manually? thank you

gaobinlong added a commit to gaobinlong/OpenSearch that referenced this pull request Feb 27, 2024
…11531)

* Fix get task API does not refresh resource stats

Signed-off-by: Gao Binlong <[email protected]>

* modify change log

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
(cherry picked from commit 8d84eea)
reta pushed a commit that referenced this pull request Feb 27, 2024
…) (#12474)

* Fix get task API does not refresh resource stats (#11531)

* Fix get task API does not refresh resource stats

Signed-off-by: Gao Binlong <[email protected]>

* modify change log

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
(cherry picked from commit 8d84eea)

* Remove unused changelog

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
peteralfonsi pushed a commit to peteralfonsi/OpenSearch that referenced this pull request Mar 1, 2024
…11531)

* Fix get task API does not refresh resource stats

Signed-off-by: Gao Binlong <[email protected]>

* modify change log

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
amkhar pushed a commit to amkhar/OpenSearch that referenced this pull request Mar 12, 2024
…11531)

* Fix get task API does not refresh resource stats

Signed-off-by: Gao Binlong <[email protected]>

* modify change log

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
Signed-off-by: Aman Khare <[email protected]>
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
…11531)

* Fix get task API does not refresh resource stats

Signed-off-by: Gao Binlong <[email protected]>

* modify change log

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…11531)

* Fix get task API does not refresh resource stats

Signed-off-by: Gao Binlong <[email protected]>

* modify change log

Signed-off-by: Gao Binlong <[email protected]>

---------

Signed-off-by: Gao Binlong <[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 bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants