-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Add support for aggregation profiler with concurrent aggregation #8801
Conversation
a89699f
to
8b8b7a6
Compare
Gradle Check (Jenkins) Run Completed with:
|
8b8b7a6
to
2f08998
Compare
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
…nsearch-project#8801) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
2f08998
to
186541b
Compare
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ticheng-aws Thanks for the refactor and adding the tests. Have few minor comments
server/src/main/java/org/opensearch/search/profile/ProfileResult.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/search/profile/ProfileResult.java
Outdated
Show resolved
Hide resolved
.../test/java/org/opensearch/search/profile/aggregation/ConcurrentAggregationProfilerTests.java
Show resolved
Hide resolved
5497508
to
c29abd5
Compare
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Ticheng Lin <ticheng@amazon.com>
c29abd5
to
7fd4d69
Compare
Hi @reta, the failed test appears to be flaky. I have successfully passed the test on my local environment.
|
@ticheng-aws You need to add this condition in the constructor of TestSearchContext
|
Signed-off-by: Ticheng Lin <ticheng@amazon.com>
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-8801-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 35662f06bbef75447ba6204bc6a7e032066509cc
# Push it to GitHub
git push --set-upstream origin backport/backport-8801-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
@ticheng-aws needs manual backport to |
…nsearch-project#8801) * Add support for aggregation profiler with concurrent aggregation (opensearch-project#8801) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Address review comments for support for aggregation profiler with concurrent aggregation (opensearch-project#8801) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Refactor ProfileResult class and add more tests Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Fix flaky QueryProfilePhaseTests.testCollapseQuerySearchResults test Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com>
Hi @reta, Sure, no problem. Please find the backport PRs below: |
…) (#9015) * Add support for aggregation profiler with concurrent aggregation (#8801) * Address review comments for support for aggregation profiler with concurrent aggregation (#8801) * Refactor ProfileResult class and add more tests * Fix flaky QueryProfilePhaseTests.testCollapseQuerySearchResults test --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com>
…nsearch-project#8801) * Add support for aggregation profiler with concurrent aggregation (opensearch-project#8801) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Address review comments for support for aggregation profiler with concurrent aggregation (opensearch-project#8801) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Refactor ProfileResult class and add more tests Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Fix flaky QueryProfilePhaseTests.testCollapseQuerySearchResults test Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
…nsearch-project#8801) * Add support for aggregation profiler with concurrent aggregation (opensearch-project#8801) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Address review comments for support for aggregation profiler with concurrent aggregation (opensearch-project#8801) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Refactor ProfileResult class and add more tests Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Fix flaky QueryProfilePhaseTests.testCollapseQuerySearchResults test Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Ivan Brusic <ivan.brusic@flocksafety.com>
…nsearch-project#8801) * Add support for aggregation profiler with concurrent aggregation (opensearch-project#8801) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Address review comments for support for aggregation profiler with concurrent aggregation (opensearch-project#8801) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Refactor ProfileResult class and add more tests Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Fix flaky QueryProfilePhaseTests.testCollapseQuerySearchResults test Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Description
Add support for aggregation profiler with concurrent aggregation.
Related Issues
Resolves #8331 #7354
Check List
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.