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

[Backport 2.x] Create listener to refresh search thread resource usage (#14832) #14900

Merged

Conversation

deshsidd
Copy link
Contributor

@deshsidd deshsidd commented Jul 23, 2024

Backporting from #14832 to 2.x

  • [bug fix] fix incorrect coordinator node search resource usages

Signed-off-by: Chenyang Ji cyji@amazon.com

  • fix bug on serialization when passing task resource usage to coordinator

Signed-off-by: Chenyang Ji cyji@amazon.com

  • add more unit tests

Signed-off-by: Chenyang Ji cyji@amazon.com

  • remove query insights plugin related code

Signed-off-by: Chenyang Ji cyji@amazon.com

  • create per request listener to refresh task resource usage

Signed-off-by: Chenyang Ji cyji@amazon.com

  • Make new listener API public

Signed-off-by: Siddhant Deshmukh deshsid@amazon.com

  • Add changelog

Signed-off-by: Siddhant Deshmukh deshsid@amazon.com

  • Remove wrong files added

Signed-off-by: Siddhant Deshmukh deshsid@amazon.com

  • Address review comments

Signed-off-by: Siddhant Deshmukh deshsid@amazon.com

  • Build fix

Signed-off-by: Siddhant Deshmukh deshsid@amazon.com

  • Make singleton

Signed-off-by: Siddhant Deshmukh deshsid@amazon.com

  • Address review comments

Signed-off-by: Siddhant Deshmukh deshsid@amazon.com

  • Make sure listener runs before plugin listeners

Signed-off-by: Siddhant Deshmukh deshsid@amazon.com

  • Spotless

Signed-off-by: Siddhant Deshmukh deshsid@amazon.com

  • Minor fix

Signed-off-by: Siddhant Deshmukh deshsid@amazon.com


Signed-off-by: Chenyang Ji cyji@amazon.com
Signed-off-by: Siddhant Deshmukh deshsid@amazon.com
Signed-off-by: Jay Deng jayd0104@gmail.com
Co-authored-by: Chenyang Ji cyji@amazon.com
Co-authored-by: Jay Deng jayd0104@gmail.com
(cherry picked from commit 8ff3bcc)

Description

[Describe what this change achieves]

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • Functionality includes testing.
  • 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.

…roject#14832)

* [bug fix] fix incorrect coordinator node search resource usages

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* fix bug on serialization when passing task resource usage to coordinator

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* add more unit tests

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* remove query insights plugin related code

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* create per request listener to refresh task resource usage

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* Make new listener API public

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Add changelog

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Remove wrong files added

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Address review comments

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Build fix

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Make singleton

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Address review comments

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Make sure listener runs before plugin listeners

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Spotless

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Minor fix

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

---------

Signed-off-by: Chenyang Ji <cyji@amazon.com>
Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
Signed-off-by: Jay Deng <jayd0104@gmail.com>
Co-authored-by: Chenyang Ji <cyji@amazon.com>
Co-authored-by: Jay Deng <jayd0104@gmail.com>
(cherry picked from commit 8ff3bcc)
Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
Copy link
Contributor

❌ Gradle check result for 54c7a85: 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 c456a59: SUCCESS

Copy link

codecov bot commented Jul 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.56%. Comparing base (ed24a14) to head (c456a59).

Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #14900      +/-   ##
============================================
+ Coverage     71.51%   71.56%   +0.05%     
- Complexity    62574    62631      +57     
============================================
  Files          5117     5118       +1     
  Lines        293941   293947       +6     
  Branches      42834    42834              
============================================
+ Hits         210214   210369     +155     
+ Misses        66102    65877     -225     
- Partials      17625    17701      +76     

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

@dbwiddis dbwiddis merged commit 8ef2f9f into opensearch-project:2.x Jul 23, 2024
31 of 32 checks passed
@dblock dblock added the v2.16.0 Issues and PRs related to version 2.16.0 label Jul 23, 2024
kkewwei pushed a commit to kkewwei/OpenSearch that referenced this pull request Jul 24, 2024
…roject#14832) (opensearch-project#14900)

* [bug fix] fix incorrect coordinator node search resource usages

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* fix bug on serialization when passing task resource usage to coordinator

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* add more unit tests

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* remove query insights plugin related code

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* create per request listener to refresh task resource usage

Signed-off-by: Chenyang Ji <cyji@amazon.com>

* Make new listener API public

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Add changelog

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Remove wrong files added

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Address review comments

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Build fix

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Make singleton

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Address review comments

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Make sure listener runs before plugin listeners

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Spotless

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

* Minor fix

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>

---------

Signed-off-by: Chenyang Ji <cyji@amazon.com>
Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
Signed-off-by: Jay Deng <jayd0104@gmail.com>
Co-authored-by: Chenyang Ji <cyji@amazon.com>
Co-authored-by: Jay Deng <jayd0104@gmail.com>
(cherry picked from commit 8ff3bcc)

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
Signed-off-by: kkewwei <kkewwei@163.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.16 v2.16.0 Issues and PRs related to version 2.16.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants