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

Revert "Removing unused fetch sub phase processor initialization during fetch… (#12503)" #13486

Merged
merged 1 commit into from
May 1, 2024

Conversation

reta
Copy link
Collaborator

@reta reta commented May 1, 2024

This reverts commit da5b205.

Description

Reverts #12503 that introduced regression in 2.13.0. Thanks a lot @martijnbolhuis for spotting it and supplying the tests, @dblock for working with the contributor.

Related Issues

Closes #13467

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 github-actions bot added Severity-Critical v2.14.0 v3.0.0 Issues and PRs related to version 3.0.0 labels May 1, 2024
Copy link
Contributor

github-actions bot commented May 1, 2024

❌ Gradle check result for fce4c49: FAILURE

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?

@reta
Copy link
Collaborator Author

reta commented May 1, 2024

@jainankitk fyi, @msfroh @dblock please take a look folks (just a revert)

@jainankitk
Copy link
Collaborator

jainankitk commented May 1, 2024

@reta - Thank you for this PR. Can you also include the repro as test case for identifying this going forward? I see the test case is included

Also, do we need to revert ScriptFieldsPhase change as well? I can also raise PR to just revert inner hits change if you want

@dblock
Copy link
Member

dblock commented May 1, 2024

@jainankitk Do you see a fix that avoids the revert and fixes the issue?

@jainankitk
Copy link
Collaborator

@jainankitk Do you see a fix that avoids the revert and fixes the issue?

We can include the changes from #13488 as part of this, or drop this and merge the other PR

@reta
Copy link
Collaborator Author

reta commented May 1, 2024

Also, do we need to revert ScriptFieldsPhase change as well? I can also raise PR to just revert inner hits change if you want

I am going to revert the change in full and ask for more tests to be added after

@jainankitk
Copy link
Collaborator

I am going to revert the change in full and ask for more tests to be added after

@reta - Can you check #13488 once?

Copy link
Contributor

github-actions bot commented May 1, 2024

✅ Gradle check result for 86cfde2: SUCCESS

Copy link

codecov bot commented May 1, 2024

Codecov Report

Attention: Patch coverage is 50.00000% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 71.44%. Comparing base (b15cb0c) to head (86cfde2).
Report is 247 commits behind head on main.

Files Patch % Lines
...earch/search/fetch/subphase/ScriptFieldsPhase.java 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13486      +/-   ##
============================================
+ Coverage     71.42%   71.44%   +0.02%     
- Complexity    59978    60974     +996     
============================================
  Files          4985     5050      +65     
  Lines        282275   286800    +4525     
  Branches      40946    41549     +603     
============================================
+ Hits         201603   204909    +3306     
- Misses        63999    64956     +957     
- Partials      16673    16935     +262     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dblock
Copy link
Member

dblock commented May 1, 2024

I am going to revert the change in full and ask for more tests to be added after

@reta - Can you check #13488 once?

It sounds like @reta and @msfroh would prefer to merge this PR vs. #13488, I'll let either of them to make that decision and hit the approve/merge buttons. I don't have a strong opinion other than I'm glad we're adding a test for the regression.

@reta reta merged commit 5133e5f into opensearch-project:main May 1, 2024
30 of 31 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 1, 2024
…ng fetch… (#12503)" (#13486)

This reverts commit da5b205.

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 5133e5f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 1, 2024
…ng fetch… (#12503)" (#13486)

This reverts commit da5b205.

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 5133e5f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
reta pushed a commit that referenced this pull request May 1, 2024
…ng fetch… (#12503)" (#13486)

This reverts commit da5b205.

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 5133e5f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>
reta pushed a commit that referenced this pull request May 1, 2024
…ng fetch… (#12503)" (#13486)

This reverts commit da5b205.

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 5133e5f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>
reta added a commit that referenced this pull request May 2, 2024
…tialization during fetch… (#12503)" (#13492)

* Revert "Removing unused fetch sub phase processor initialization during fetch… (#12503)" (#13486)

This reverts commit da5b205.

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 5133e5f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>

* Update 400_inner_hits.yml

Signed-off-by: Andriy Redko <[email protected]>

---------

Signed-off-by: Andriy Redko <[email protected]>
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 <[email protected]>
reta added a commit that referenced this pull request May 2, 2024
…ialization during fetch… (#12503)" (#13491)

* Revert "Removing unused fetch sub phase processor initialization during fetch… (#12503)" (#13486)

This reverts commit da5b205.

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 5133e5f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <[email protected]>

* Update 400_inner_hits.yml

Signed-off-by: Andriy Redko <[email protected]>

---------

Signed-off-by: Andriy Redko <[email protected]>
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 <[email protected]>
finnegancarroll pushed a commit to finnegancarroll/OpenSearch that referenced this pull request May 10, 2024
deshsidd pushed a commit to deshsidd/OpenSearch that referenced this pull request May 17, 2024
parv0201 pushed a commit to parv0201/OpenSearch that referenced this pull request Jun 10, 2024
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 backport 2.14 Backport to 2.14 branch bug Something isn't working Search:Aggregations Severity-Critical v2.14.0 v3.0.0 Issues and PRs related to version 3.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Missing inner hits in top hits of an aggregation results since upgrade to 2.13.0
5 participants