Fix flaky query profile phase tests with concurrent search enabled #10547
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ticheng-aws
requested review from
reta,
anasalkouz,
andrross,
Bukhtawar,
CEHENKLE,
dblock,
gbbafna,
setiah,
kartg,
kotwanikunal,
mch2,
nknize,
owaiskazi19,
peternied,
Rishikesh1159,
ryanbogan,
saratvemulapalli,
shwetathareja,
dreamer-89,
VachaShah,
dbwiddis,
sachinpkale,
sohami and
msfroh
as code owners
github-actions
bot
added
bug
ticheng-aws
added a commit
to ticheng-aws/OpenSearch
that referenced
this pull request
Oct 10, 2023
…pensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
ticheng-aws
force-pushed
the
cs-query-profile-phase-tests
branch
from
31d2896
to
daa333a
Compare
ticheng-aws
added a commit
to ticheng-aws/OpenSearch
that referenced
this pull request
Oct 10, 2023
…pensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
ticheng-aws
force-pushed
the
cs-query-profile-phase-tests
branch
from
daa333a
to
a312337
Compare
…pensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
ticheng-aws
force-pushed
the
cs-query-profile-phase-tests
branch
from
a312337
to
907aad6
Compare
Gradle Check (Jenkins) Run Completed with:
|
dblock
approved these changes
Oct 11, 2023
|
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-10547-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c4f5dd9f4d45530ad22f165f5ec88736534e5827
# Push it to GitHub
git push --set-upstream origin backport/backport-10547-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.xThen, create a pull request where the |
This was referenced Oct 11, 2023
deshsidd
pushed a commit
to deshsidd/OpenSearch
that referenced
this pull request
Oct 19, 2023
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
austintlee
pushed a commit
to austintlee/OpenSearch
that referenced
this pull request
Oct 23, 2023
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
austintlee
pushed a commit
to austintlee/OpenSearch
that referenced
this pull request
Oct 23, 2023
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
7 tasks
sohami
pushed a commit
to sohami/OpenSearch
that referenced
this pull request
Oct 24, 2023
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
8 tasks
sohami
pushed a commit
to sohami/OpenSearch
that referenced
this pull request
Oct 30, 2023
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
sohami
pushed a commit
to sohami/OpenSearch
that referenced
this pull request
Oct 31, 2023
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
reta
pushed a commit
that referenced
this pull request
Oct 31, 2023
…#10898) * Add support for query profiler with concurrent aggregation (#9248) * Add support for query profiler with concurrent aggregation (#9248) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Refactor and work on the PR comments Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Update collectorToLeaves mapping for children breakdowns post profile metric collection and before creating the results Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com> * Refactor logic to compute the slice level breakdown stats and query level breakdown stats for concurrent search case Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com> * Fix QueryProfilePhaseTests and QueryProfileTests, and parameterize QueryProfilerIT with concurrent search enabled Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Handle the case when there are no leaf context to compute the profile stats to return default stats for all breakdown type along with min/max/avg values. Replace queryStart and queryEnd time with queryNodeTime Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com> * Add UTs for ConcurrentQueryProfileBreakdown Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com> * Add concurrent search stats test into the QueryProfilerIT Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Address review comments Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com> Co-authored-by: Sorabh Hamirwasia <sohami.apache@gmail.com> * Fix NPE in ConcurrentQueryProfile while computing the breakdown map for slices (#10111) * Fix NPE in ConcurrentQueryProfile while computing the breakdown map for slices. There can be cases where one or more slice may not have timing related information for its leaves in contexts map. During creation of slice and query level breakdown map it needs to handle such cases by using default values correctly. Also updating the min/max/avg sliceNodeTime to not include time to create weight and wait times by slice threads. It will reflect the min/max/avg execution time of each slice whereas totalNodeTime will reflect the total query time. Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com> * Address review comments Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com> --------- Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com> * Fix flaky query profile phase tests with concurrent search enabled (#10547) (#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Introduce ConcurrentQueryProfiler to profile query using concurrent segment search path and support concurrency during rewrite and create weight (#10352) * Fix timer race condition in profile rewrite and create weight for concurrent segment search (#10352) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Refactor and work on the PR comments (#10352) Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Sorabh Hamirwasia <sohami.apache@gmail.com> Co-authored-by: Ticheng Lin <51488860+ticheng-aws@users.noreply.github.com>
austintlee
pushed a commit
to austintlee/OpenSearch
that referenced
this pull request
Dec 13, 2023
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
austintlee
pushed a commit
to austintlee/OpenSearch
that referenced
this pull request
Jan 19, 2024
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
austintlee
pushed a commit
to austintlee/OpenSearch
that referenced
this pull request
Jan 19, 2024
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
austintlee
pushed a commit
to austintlee/OpenSearch
that referenced
this pull request
Feb 6, 2024
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
austintlee
pushed a commit
to austintlee/OpenSearch
that referenced
this pull request
Feb 6, 2024
…pensearch-project#10547) (opensearch-project#10547) Signed-off-by: Ticheng Lin <ticheng@amazon.com>
shiv0408
pushed a commit
to Gaurav614/OpenSearch
that referenced
this pull request
Apr 25, 2024
…pensearch-project#10547) (opensearch-project#10547) 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
These flaky tests use
RandomIndexWriterto add random number of documents to the search index. As long as thescore_countin the concurrent search case matches the non-concurrent search case, we can tune the expected value formin_score/min_score_countto make it less sensitive. I ran the new changes 100+ times to make sure that they all passed.https://github.com/opensearch-project/OpenSearch/pull/10437/files#diff-76990998add8052236baed94bbd99228acb695e70fd797ec2679130de6f45c55
Related Issues
Resolves #10469, resolves #9932, resolves #10139
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.