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

Add support for aggregation profiler with concurrent aggregation #8801

Merged
merged 4 commits into from
Jul 31, 2023

Conversation

ticheng-aws
Copy link
Contributor

@ticheng-aws ticheng-aws commented Jul 20, 2023

Description

Add support for aggregation profiler with concurrent aggregation.

Related Issues

Resolves #8331 #7354

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

ticheng-aws added a commit to ticheng-aws/OpenSearch that referenced this pull request Jul 20, 2023
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Copy link
Collaborator

@sohami sohami left a 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

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Ticheng Lin <ticheng@amazon.com>
@ticheng-aws
Copy link
Contributor Author

LGTM, thanks a lot @ticheng-aws ! But we have test failures ...

Hi @reta, the failed test appears to be flaky. I have successfully passed the test on my local environment.

Tests with failures:
 - org.opensearch.search.query.QueryProfilePhaseTests.testCollapseQuerySearchResults {p0=5 p1=org.opensearch.search.query.ConcurrentQueryPhaseSearcher@2676dc05}

@sohami
Copy link
Collaborator

sohami commented Jul 29, 2023

LGTM, thanks a lot @ticheng-aws ! But we have test failures ...

Hi @reta, the failed test appears to be flaky. I have successfully passed the test on my local environment.

Tests with failures:
 - org.opensearch.search.query.QueryProfilePhaseTests.testCollapseQuerySearchResults {p0=5 p1=org.opensearch.search.query.ConcurrentQueryPhaseSearcher@2676dc05}

@ticheng-aws You need to add this condition in the constructor of TestSearchContext

this.concurrentSegmentSearchEnabled = searcher != null && (searcher.getExecutor() != null);

Signed-off-by: Ticheng Lin <ticheng@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.index.IndexServiceTests.testAsyncTranslogTrimTaskOnClosedIndex

@ticheng-aws ticheng-aws requested a review from reta July 31, 2023 16:46
@reta reta merged commit 35662f0 into opensearch-project:main Jul 31, 2023
@reta reta added the backport 2.x Backport to 2.x branch label Jul 31, 2023
@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:

# 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 base branch is 2.x and the compare/head branch is backport/backport-8801-to-2.x.

@reta
Copy link
Collaborator

reta commented Jul 31, 2023

@ticheng-aws needs manual backport to 2.x sadly :(

ticheng-aws added a commit to ticheng-aws/OpenSearch that referenced this pull request Aug 1, 2023
…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>
@ticheng-aws
Copy link
Contributor Author

reta pushed a commit that referenced this pull request Aug 1, 2023
…) (#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>
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Sep 12, 2023
…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>
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
…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>
@ticheng-aws ticheng-aws self-assigned this Nov 2, 2023
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…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>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Concurrent Segment Search] Add support for aggregation profiler with concurrent aggregation
4 participants