-
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 wrapping CollectorManager with profiling during concurrent execution #9129
Conversation
ee875a2
to
f2d70fc
Compare
Compatibility status:
|
Compatibility status:
|
Gradle Check (Jenkins) Run Completed with:
|
Codecov Report
@@ Coverage Diff @@
## main #9129 +/- ##
============================================
- Coverage 71.19% 71.08% -0.11%
+ Complexity 57455 57390 -65
============================================
Files 4777 4777
Lines 270712 270747 +35
Branches 39566 39569 +3
============================================
- Hits 192729 192458 -271
- Misses 61782 62089 +307
+ Partials 16201 16200 -1
|
Gradle Check (Jenkins) Run Completed with:
|
server/src/main/java/org/opensearch/search/aggregations/AggregationCollectorManager.java
Outdated
Show resolved
Hide resolved
…-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
2bf382d
to
7536cfc
Compare
Gradle Check (Jenkins) Run Completed with:
|
…rrent execution (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
…-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
7536cfc
to
eb7555f
Compare
Gradle Check (Jenkins) Run Completed with:
|
Compatibility status:
|
…rrent execution (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
…-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
eb7555f
to
11b24c3
Compare
Compatibility status:Checks if related components are compatible with change 0a7eade Incompatible componentsIncompatible components: [https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/security-analytics.git] Skipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git] |
Gradle Check (Jenkins) Run Completed with:
|
The backport to
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-9129-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 152321b3adaa06199d741472baca964f90aff068
# Push it to GitHub
git push --set-upstream origin backport/backport-9129-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 |
…rrent execution (opensearch-project#9129) * Add support for wrapping CollectorManager with profiling during concurrent execution (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Add more collectorResult test and work on the PR comments (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com>
…rrent execution (opensearch-project#9129) * Add support for wrapping CollectorManager with profiling during concurrent execution (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Add more collectorResult test and work on the PR comments (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com>
…rrent execution (#9129) (#9373) * Add support for wrapping CollectorManager with profiling during concurrent execution (#9129) * Add more collectorResult test and work on the PR comments (#9129) --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
…rrent execution (opensearch-project#9129) * Add support for wrapping CollectorManager with profiling during concurrent execution (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Add more collectorResult test and work on the PR comments (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Kiran Reddy <kkreddy@amazon.com>
…rrent execution (opensearch-project#9129) * Add support for wrapping CollectorManager with profiling during concurrent execution (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Add more collectorResult test and work on the PR comments (opensearch-project#9129) 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>
…rrent execution (opensearch-project#9129) * Add support for wrapping CollectorManager with profiling during concurrent execution (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Add more collectorResult test and work on the PR comments (opensearch-project#9129) 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>
…rrent execution (opensearch-project#9129) * Add support for wrapping CollectorManager with profiling during concurrent execution (opensearch-project#9129) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Add more collectorResult test and work on the PR comments (opensearch-project#9129) 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
In the multi-level aggregation profile with concurrent execution, the response’s collectors miss profiling aggregator information. This happens because the AggCollectorManager is not wrapped by the InternalProfileCollectorManager when the profile is enabled and concurrent execution takes place. To resolve the issue, we need to wrap all the sub-collectorManagers with the InternalProfileCollectorManager.
Example of a valid profile response with concurrent search enabled:
Related Issues
Resolves #8332 #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.