Fix slice collectors to leaves association with post filter #11134

ticheng-aws · 2023-11-08T05:40:11Z

Description

In the post filter query, a profile node is created during the creation of the filtered collector context, which occurred before the concurrent path in ContextIndexSearcher::search(). However, there is no association call for the filtered collector to leaves. Consequently, this led to an unexpected context size when generating the profile results.

This PR adds the association for the collector to leaves before building the scorer on the post-filter profile node. Following this modification, we can identify the missing association call for sliceCollectorsToLeave@739870973, and we can also confirm that the leaf counts in the contexts map match those in sliceCollectorsToLeaves when we invoke toBreakdownMap() to build the result.

------------ post filter query with 2 slices and 1 leaf/slice -------------
-- query rewrite --
-- query rewrite --
[T#21] ConcurrentQueryProfileBreakdown.sliceCollectorsToLeaves@2013178468
[T#21] searcher.search(query, collectorManager)
-- query rewrite --
[T#21] ConcurrentQueryProfileBreakdown.sliceCollectorsToLeaves@739870973
[T#21] ConcurrentQueryProfileBreakdown.sliceCollectorsToLeaves@208094559
[T#26] == search ===
[T#27] == search ===
[T#26] = searchLeaf() =
[T#27] = searchLeaf() =
[T#27] ConcurrentQueryProfileBreakdown.associateCollectorToLeaves() | sliceCollectorsToLeaves@739870973
[T#26] ConcurrentQueryProfileBreakdown.associateCollectorToLeaves() | sliceCollectorsToLeaves@739870973
[T#27] FilteredCollector.getLeafCollector() called
[T#26] FilteredCollector.getLeafCollector() called
[T#27] ConcurrentQueryProfileBreakdown.associateCollectorToLeaves() | sliceCollectorsToLeaves@2013178468
[T#26] ConcurrentQueryProfileBreakdown.associateCollectorToLeaves() | sliceCollectorsToLeaves@2013178468
[T#27] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_1(9.8.0):C76 | sliceCollectorsToLeaves@2013178468
[T#26] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_0(9.8.0):C524 | sliceCollectorsToLeaves@2013178468
[T#27] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_1(9.8.0):C76 | sliceCollectorsToLeaves@2013178468
[T#26] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_0(9.8.0):C524 | sliceCollectorsToLeaves@2013178468
[T#27] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_1(9.8.0):C76 | sliceCollectorsToLeaves@739870973
[T#26] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_0(9.8.0):C524 | sliceCollectorsToLeaves@739870973
[T#27] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_1(9.8.0):C76 | sliceCollectorsToLeaves@208094559
[T#26] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_0(9.8.0):C524 | sliceCollectorsToLeaves@208094559
[T#27] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_1(9.8.0):C76 | sliceCollectorsToLeaves@208094559
[T#26] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_0(9.8.0):C524 | sliceCollectorsToLeaves@208094559
[T#27] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_1(9.8.0):C76 | sliceCollectorsToLeaves@739870973
[T#26] ConcurrentQueryProfileBreakdown.context() context=LeafReaderContext(FilterLeafReader(_0(9.8.0):C524 | sliceCollectorsToLeaves@739870973
[T#21] ConcurrentQueryProfileBreakdown.associateCollectorsToLeaves() | sliceCollectorsToLeaves@208094559
[T#21] toBreakdownMap() contexts=2 | sliceCollectorsToLeaves@2013178468=2
...
[T#21] toBreakdownMap() contexts=2 | sliceCollectorsToLeaves@208094559=2
...
[T#21] toBreakdownMap() contexts=2 | sliceCollectorsToLeaves@739870973=2
...

Related Issues

Resolves #10767

Check List

~~New functionality includes testing.~~
- All tests pass
~~New functionality has been documented.~~
- ~~New functionality has javadoc added~~
Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
Commits are signed per the DCO using --signoff
~~Commit changes are listed out in CHANGELOG.md file (See: Changelog)~~
~~Public documentation issue/PR created~~

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 · 2023-11-08T05:49:03Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/29705/
CommitID: 17474d0
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?

github-actions · 2023-11-08T06:02:20Z

Compatibility status:

Checks if related components are compatible with change a19ce33

Incompatible components

Incompatible components: [https://github.com/opensearch-project/performance-analyzer.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git]

…search-project#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com>

github-actions · 2023-11-08T17:29:44Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/29722/
CommitID: fc6a3f7
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?

…search-project#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com>

github-actions · 2023-11-09T01:43:11Z

Gradle Check (Jenkins) Run Completed with:

RESULT: SUCCESS ✅
URL: https://build.ci.opensearch.org/job/gradle-check/29755/
CommitID: 1c1cec3

codecov · 2023-11-09T01:43:56Z

Codecov Report

Merging #11134 (a19ce33) into main (61a598b) will increase coverage by 0.02%.
The diff coverage is 50.00%.

@@             Coverage Diff              @@
##               main   #11134      +/-   ##
============================================
+ Coverage     71.15%   71.18%   +0.02%     
- Complexity    58798    58811      +13     
============================================
  Files          4883     4883              
  Lines        277141   277146       +5     
  Branches      40280    40281       +1     
============================================
+ Hits         197200   197283      +83     
+ Misses        63452    63376      -76     
+ Partials      16489    16487       -2

Files	Coverage Δ
...search/common/lucene/search/FilteredCollector.java	`100.00% <100.00%> (ø)`
...profile/query/ConcurrentQueryProfileBreakdown.java	`93.56% <0.00%> (-1.08%)`	⬇️

... and 472 files with indirect coverage changes

…search-project#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com>

github-actions · 2023-11-09T18:32:02Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/29769/
CommitID: 12eb4b7
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?

…search-project#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com>

github-actions · 2023-11-09T19:26:07Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.search.SearchWeightedRoutingIT.testShardRoutingWithNetworkDisruption_FailOpenEnabled

URL: https://build.ci.opensearch.org/job/gradle-check/29772/
CommitID: 9e90dfa
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

ticheng-aws · 2023-11-09T19:54:09Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕

TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testShardRoutingWithNetworkDisruption_FailOpenEnabled
URL: https://build.ci.opensearch.org/job/gradle-check/29772/

CommitID: 9e90dfa
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

This is a known flaky test #10673

ticheng-aws · 2023-11-09T19:57:23Z

Hi @sohami and @reta, please help to review. Thank you in advance.

server/src/main/java/org/opensearch/search/profile/query/ConcurrentQueryProfileBreakdown.java

…rrentQueryProfileBreakdown.java Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Ticheng Lin <51488860+ticheng-aws@users.noreply.github.com> Signed-off-by: Ticheng Lin <ticheng@amazon.com>

github-actions · 2023-11-09T20:35:59Z

Gradle Check (Jenkins) Run Completed with:

RESULT: FAILURE ❌
URL: https://build.ci.opensearch.org/job/gradle-check/29778/
CommitID: a14f248
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?

github-actions · 2023-11-09T21:19:41Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕
TEST FAILURES:

      1 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString_FailOpenEnabled
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testNonZeroPrimaryStatsOnNewlyCreatedIndexWithZeroDocs
      1 org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness

URL: https://build.ci.opensearch.org/job/gradle-check/29779/
CommitID: a19ce33
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

ticheng-aws · 2023-11-09T21:35:44Z

Gradle Check (Jenkins) Run Completed with:

RESULT: UNSTABLE ❕

TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString_FailOpenEnabled
      1 org.opensearch.remotestore.RemoteStoreStatsIT.testNonZeroPrimaryStatsOnNewlyCreatedIndexWithZeroDocs
      1 org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness
URL: https://build.ci.opensearch.org/job/gradle-check/29779/

CommitID: a19ce33
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

#3603
#8030
#11149

* Fix slice collectors to leaves association with profile enabled (#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Update server/src/main/java/org/opensearch/search/profile/query/ConcurrentQueryProfileBreakdown.java Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Ticheng Lin <51488860+ticheng-aws@users.noreply.github.com> Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Ticheng Lin <51488860+ticheng-aws@users.noreply.github.com> Co-authored-by: Andriy Redko <drreta@gmail.com> (cherry picked from commit 3eda422) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…11150) * Fix slice collectors to leaves association with profile enabled (#11134) * Update server/src/main/java/org/opensearch/search/profile/query/ConcurrentQueryProfileBreakdown.java --------- (cherry picked from commit 3eda422) Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Ticheng Lin <51488860+ticheng-aws@users.noreply.github.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Andriy Redko <drreta@gmail.com>

…ch-project#11134) * Fix slice collectors to leaves association with profile enabled (opensearch-project#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Update server/src/main/java/org/opensearch/search/profile/query/ConcurrentQueryProfileBreakdown.java Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Ticheng Lin <51488860+ticheng-aws@users.noreply.github.com> Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Ticheng Lin <51488860+ticheng-aws@users.noreply.github.com> Co-authored-by: Andriy Redko <drreta@gmail.com>

…ch-project#11134) * Fix slice collectors to leaves association with profile enabled (opensearch-project#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com> * Update server/src/main/java/org/opensearch/search/profile/query/ConcurrentQueryProfileBreakdown.java Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Ticheng Lin <51488860+ticheng-aws@users.noreply.github.com> Signed-off-by: Ticheng Lin <ticheng@amazon.com> --------- Signed-off-by: Ticheng Lin <ticheng@amazon.com> Signed-off-by: Ticheng Lin <51488860+ticheng-aws@users.noreply.github.com> Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>

github-actions bot added the bug Something isn't working label Nov 8, 2023

ticheng-aws added the skip-changelog label Nov 8, 2023

ticheng-aws added a commit to ticheng-aws/OpenSearch that referenced this pull request Nov 8, 2023

Fix slice collectors to leaves association with profile enabled (open…

fc6a3f7

…search-project#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com>

ticheng-aws force-pushed the cs-col-to-lea-asso branch from 17474d0 to fc6a3f7 Compare November 8, 2023 16:59

ticheng-aws added a commit to ticheng-aws/OpenSearch that referenced this pull request Nov 9, 2023

Fix slice collectors to leaves association with profile enabled (open…

1c1cec3

…search-project#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com>

ticheng-aws force-pushed the cs-col-to-lea-asso branch from fc6a3f7 to 1c1cec3 Compare November 9, 2023 00:59

ticheng-aws added a commit to ticheng-aws/OpenSearch that referenced this pull request Nov 9, 2023

Fix slice collectors to leaves association with profile enabled (open…

12eb4b7

…search-project#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com>

ticheng-aws force-pushed the cs-col-to-lea-asso branch from 1c1cec3 to 12eb4b7 Compare November 9, 2023 17:31

Fix slice collectors to leaves association with profile enabled (open…

9e90dfa

…search-project#11134) Signed-off-by: Ticheng Lin <ticheng@amazon.com>

ticheng-aws force-pushed the cs-col-to-lea-asso branch from 12eb4b7 to 9e90dfa Compare November 9, 2023 18:35

ticheng-aws marked this pull request as ready for review November 9, 2023 19:55

ticheng-aws requested review from abbashus, adnapibar, anasalkouz, andrross, Bukhtawar, CEHENKLE, dblock, dbwiddis, dreamer-89, gbbafna and kartg as code owners November 9, 2023 19:55

ticheng-aws requested review from ryanbogan, sachinpkale, saratvemulapalli, setiah, shwetathareja, sohami, tlfeng and VachaShah as code owners November 9, 2023 19:55

ticheng-aws changed the title ~~Fix slice collectors to leaves association with profile enabled~~ Fix slice collectors to leaves association with post filter Nov 9, 2023

reta reviewed Nov 9, 2023

View reviewed changes

server/src/main/java/org/opensearch/search/profile/query/ConcurrentQueryProfileBreakdown.java Outdated Show resolved Hide resolved

github-actions bot added Search Search query, autocomplete ...etc v2.12.0 Issues and PRs related to version 2.12.0 v3.0.0 Issues and PRs related to version 3.0.0 labels Nov 9, 2023

reta reviewed Nov 9, 2023

View reviewed changes

server/src/main/java/org/opensearch/search/profile/query/ConcurrentQueryProfileBreakdown.java Outdated Show resolved Hide resolved

Update server/src/main/java/org/opensearch/search/profile/query/Concu…

a19ce33

…rrentQueryProfileBreakdown.java Co-authored-by: Andriy Redko <drreta@gmail.com> Signed-off-by: Ticheng Lin <51488860+ticheng-aws@users.noreply.github.com> Signed-off-by: Ticheng Lin <ticheng@amazon.com>

ticheng-aws force-pushed the cs-col-to-lea-asso branch from a14f248 to a19ce33 Compare November 9, 2023 20:31

ticheng-aws requested a review from reta November 9, 2023 20:34

reta approved these changes Nov 9, 2023

View reviewed changes

reta merged commit 3eda422 into opensearch-project:main Nov 9, 2023
31 of 32 checks passed

reta added the backport 2.x Backport to 2.x branch label Nov 9, 2023

opensearch-trigger-bot bot mentioned this pull request Nov 9, 2023

[Backport 2.x] Fix slice collectors to leaves association with post filter #11150

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix slice collectors to leaves association with post filter #11134

Fix slice collectors to leaves association with post filter #11134

ticheng-aws commented Nov 8, 2023 •

edited

Loading

github-actions bot commented Nov 8, 2023

github-actions bot commented Nov 8, 2023 •

edited

Loading

github-actions bot commented Nov 8, 2023

github-actions bot commented Nov 9, 2023

codecov bot commented Nov 9, 2023 •

edited

Loading

github-actions bot commented Nov 9, 2023

github-actions bot commented Nov 9, 2023

ticheng-aws commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

ticheng-aws commented Nov 9, 2023

github-actions bot commented Nov 9, 2023

github-actions bot commented Nov 9, 2023

ticheng-aws commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

Fix slice collectors to leaves association with post filter #11134

Fix slice collectors to leaves association with post filter #11134

Conversation

ticheng-aws commented Nov 8, 2023 • edited Loading

Description

Related Issues

Check List

github-actions bot commented Nov 8, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Nov 8, 2023 • edited Loading

Compatibility status:

Incompatible components

Skipped components

Compatible components

github-actions bot commented Nov 8, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

codecov bot commented Nov 9, 2023 • edited Loading

Codecov Report

github-actions bot commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

ticheng-aws commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

ticheng-aws commented Nov 9, 2023

github-actions bot commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

github-actions bot commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

ticheng-aws commented Nov 9, 2023

Gradle Check (Jenkins) Run Completed with:

ticheng-aws commented Nov 8, 2023 •

edited

Loading

github-actions bot commented Nov 8, 2023 •

edited

Loading

codecov bot commented Nov 9, 2023 •

edited

Loading