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

[WLM] add wlm support for scroll API #16981

Merged
merged 6 commits into from
Jan 28, 2025

Conversation

kaushalmahi12
Copy link
Contributor

@kaushalmahi12 kaushalmahi12 commented Jan 8, 2025

Description

This change mitigates the warn level logs from QueryGroupTask#getQueryGroupId method when the queryGroupId is null. Currently all APIs which use SearchTask or SearchShardTask for task level resource tracking have to call the setQueryGroupId method otherwise this results in generating the log mentioned in the related issues.

Related Issues

Resolves #16874

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.

Copy link
Contributor

github-actions bot commented Jan 8, 2025

❌ Gradle check result for 3c4992e: 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 8, 2025

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

@andrross
Copy link
Member

@kaushalmahi12 Are we missing tests that could have caught this issue?

@kaushalmahi12
Copy link
Contributor Author

@andrross I think it would a good idea to add a test which will cover all the APIs. Let me do that next.

Copy link
Contributor

❌ Gradle check result for 0c37980: 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 745bd3a: 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 6e5f44d: 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.

Copy link

codecov bot commented Jan 23, 2025

Codecov Report

Attention: Patch coverage is 85.71429% with 1 line in your changes missing coverage. Please review.

Project coverage is 72.36%. Comparing base (931c1aa) to head (6973d28).
Report is 18 commits behind head on main.

Files with missing lines Patch % Lines
...rch/action/search/TransportSearchScrollAction.java 66.66% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #16981      +/-   ##
============================================
+ Coverage     72.30%   72.36%   +0.05%     
- Complexity    65482    65503      +21     
============================================
  Files          5309     5309              
  Lines        304324   304331       +7     
  Branches      44132    44133       +1     
============================================
+ Hits         220056   220229     +173     
+ Misses        66259    66029     -230     
- Partials      18009    18073      +64     

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

Signed-off-by: Kaushal Kumar <[email protected]>
Signed-off-by: Kaushal Kumar <[email protected]>
Signed-off-by: Kaushal Kumar <[email protected]>
Signed-off-by: Kaushal Kumar <[email protected]>
Copy link
Contributor

✅ Gradle check result for a7b50d3: SUCCESS

@github-actions github-actions bot added the v2.19.0 Issues and PRs related to version 2.19.0 label Jan 28, 2025
Copy link
Contributor

❌ Gradle check result for 6973d28: 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 6973d28: SUCCESS

@jainankitk jainankitk merged commit c5ab162 into opensearch-project:main Jan 28, 2025
30 checks passed
@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-16981-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c5ab16264d5e3624e2cf368f475ff3b5bc6e0bf9
# Push it to GitHub
git push --set-upstream origin backport/backport-16981-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-16981-to-2.x.

kaushalmahi12 added a commit to kaushalmahi12/OpenSearch that referenced this pull request Jan 28, 2025
* add wlm support for scroll API

Signed-off-by: Kaushal Kumar <[email protected]>

* add CHANGELOG entry

Signed-off-by: Kaushal Kumar <[email protected]>

* remove untagged tasks from WLM tracking

Signed-off-by: Kaushal Kumar <[email protected]>

* add UTs for invalid tasks

Signed-off-by: Kaushal Kumar <[email protected]>

* fix UT failures

Signed-off-by: Kaushal Kumar <[email protected]>

* rename a field in QueryGroupTask

Signed-off-by: Kaushal Kumar <[email protected]>

---------

Signed-off-by: Kaushal Kumar <[email protected]>
jainankitk pushed a commit that referenced this pull request Jan 29, 2025
* [WLM] Add wlm support for scroll API (#16981)

* add wlm support for scroll API

Signed-off-by: Kaushal Kumar <[email protected]>

* add CHANGELOG entry

Signed-off-by: Kaushal Kumar <[email protected]>

* remove untagged tasks from WLM tracking

Signed-off-by: Kaushal Kumar <[email protected]>

* add UTs for invalid tasks

Signed-off-by: Kaushal Kumar <[email protected]>

* fix UT failures

Signed-off-by: Kaushal Kumar <[email protected]>

* rename a field in QueryGroupTask

Signed-off-by: Kaushal Kumar <[email protected]>

---------

Signed-off-by: Kaushal Kumar <[email protected]>

* remove breaking backward compatible changes

Signed-off-by: Kaushal Kumar <[email protected]>

---------

Signed-off-by: Kaushal Kumar <[email protected]>
etolbakov pushed a commit to etolbakov/OpenSearch that referenced this pull request Jan 29, 2025
* add wlm support for scroll API

Signed-off-by: Kaushal Kumar <[email protected]>

* add CHANGELOG entry

Signed-off-by: Kaushal Kumar <[email protected]>

* remove untagged tasks from WLM tracking

Signed-off-by: Kaushal Kumar <[email protected]>

* add UTs for invalid tasks

Signed-off-by: Kaushal Kumar <[email protected]>

* fix UT failures

Signed-off-by: Kaushal Kumar <[email protected]>

* rename a field in QueryGroupTask

Signed-off-by: Kaushal Kumar <[email protected]>

---------

Signed-off-by: Kaushal Kumar <[email protected]>
Signed-off-by: Eugene Tolbakov <[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 Search Search query, autocomplete ...etc v2.19.0 Issues and PRs related to version 2.19.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] new QueryGroupTask warning in 2.18
3 participants