Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction #12293

reta · 2024-02-12T20:47:19Z

Description

Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction

Related Issues

Reverts #12035 and fixes

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 · 2024-02-12T21:08:45Z

Compatibility status:

Checks if related components are compatible with change a231a63

Incompatible components

Skipped components

Compatible components

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

github-actions · 2024-02-12T21:17:39Z

❌ Gradle check result for 0e43513: 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 · 2024-02-12T21:30:53Z

❌ Gradle check result for 0e43513: FAILURE

#9464
#8771

github-actions · 2024-02-12T21:38:12Z

❌ Gradle check result for 026a001: 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?

github-actions · 2024-02-12T21:40:08Z

❌ Gradle check result for 1efb008: 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?

github-actions · 2024-02-12T22:34:10Z

❕ Gradle check result for 1b016d8: UNSTABLE

TEST FAILURES:

      1 org.opensearch.search.SearchTimeoutIT.testSimpleTimeout {p0={"search.concurrent_segment_search.enabled":"false"}}
      1 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing

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

codecov · 2024-02-12T22:35:08Z

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (bff8eb7) 71.49% compared to head (a231a63) 71.36%.

Files	Patch %	Lines
.../action/search/WrappingSearchAsyncActionPhase.java	83.33%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #12293      +/-   ##
============================================
- Coverage     71.49%   71.36%   -0.14%     
+ Complexity    59859    59793      -66     
============================================
  Files          4959     4960       +1     
  Lines        281129   281130       +1     
  Branches      40857    40858       +1     
============================================
- Hits         201003   200636     -367     
- Misses        63425    63818     +393     
+ Partials      16701    16676      -25

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

reta · 2024-02-13T18:30:02Z

❌ Gradle check result for 23defeb: FAILURE

#12303

github-actions · 2024-02-13T19:13:37Z

❕ Gradle check result for 23defeb: UNSTABLE

TEST FAILURES:

      1 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing

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

server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java

server/src/main/java/org/opensearch/action/search/WrappingSearchAsyncActionPhase.java

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

github-actions · 2024-02-13T22:57:48Z

❕ Gradle check result for 636440a: UNSTABLE

TEST FAILURES:

      3 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing

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

github-actions · 2024-02-13T23:47:36Z

❌ Gradle check result for a231a63: 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 · 2024-02-13T23:50:44Z

❌ Gradle check result for a231a63: FAILURE

#12308

github-actions · 2024-02-14T00:38:38Z

❌ Gradle check result for a231a63: 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 · 2024-02-14T01:03:20Z

❌ Gradle check result for a231a63: FAILURE

#9191

github-actions · 2024-02-14T01:52:22Z

❕ Gradle check result for a231a63: UNSTABLE

TEST FAILURES:

      1 org.opensearch.search.SearchWeightedRoutingIT.testMultiGetWithNetworkDisruption_FailOpenEnabled
      1 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing

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

reta · 2024-02-14T01:54:26Z

@andrross mind please re-approving (after conflict resolution), thank you!

reta · 2024-02-15T12:37:56Z

@andrross mind please re-approving (after conflict resolution), thank you!

opensearch-trigger-bot · 2024-02-16T16:55:57Z

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:

# 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-12293-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b19e4270f07e80b7d4fcc9473ff46deb61e4719c
# Push it to GitHub
git push --set-upstream origin backport/backport-12293-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 base branch is 2.x and the compare/head branch is backport/backport-12293-to-2.x.

…tart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction (opensearch-project#12293) * Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction Signed-off-by: Andriy Redko <[email protected]> * Address code review comments Signed-off-by: Andriy Redko <[email protected]> --------- Signed-off-by: Andriy Redko <[email protected]> (cherry picked from commit b19e427)

…tart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction (#12293) (#12349) * Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction Signed-off-by: Andriy Redko <[email protected]> * Address code review comments Signed-off-by: Andriy Redko <[email protected]> --------- Signed-off-by: Andriy Redko <[email protected]> (cherry picked from commit b19e427)

…tart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction (opensearch-project#12293) * Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction Signed-off-by: Andriy Redko <[email protected]> * Address code review comments Signed-off-by: Andriy Redko <[email protected]> --------- Signed-off-by: Andriy Redko <[email protected]>

…tart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction (opensearch-project#12293) * Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction Signed-off-by: Andriy Redko <[email protected]> * Address code review comments Signed-off-by: Andriy Redko <[email protected]> --------- Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: Shivansh Arora <[email protected]>

reta force-pushed the fix.phase.callback branch from 0e43513 to 026a001 Compare February 12, 2024 21:26

reta force-pushed the fix.phase.callback branch 2 times, most recently from 1efb008 to 1b016d8 Compare February 12, 2024 21:37

reta force-pushed the fix.phase.callback branch from 1b016d8 to 9f38f6f Compare February 13, 2024 00:56

reta marked this pull request as ready for review February 13, 2024 00:56

reta requested review from abbashus, adnapibar, anasalkouz, andrross, Bukhtawar, CEHENKLE, dblock, dbwiddis, dreamer-89, gbbafna, kartg, kotwanikunal, mch2, msfroh, nknize, owaiskazi19, Rishikesh1159 and ryanbogan as code owners February 13, 2024 00:56

dzane17 reviewed Feb 13, 2024

View reviewed changes

server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java Outdated Show resolved Hide resolved

dzane17 reviewed Feb 13, 2024

View reviewed changes

server/src/main/java/org/opensearch/action/search/WrappingSearchAsyncActionPhase.java Show resolved Hide resolved

Address code review comments

636440a

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

dzane17 approved these changes Feb 13, 2024

View reviewed changes

andrross approved these changes Feb 13, 2024

View reviewed changes

Merge branch 'main' into fix.phase.callback

a231a63

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

andrross approved these changes Feb 16, 2024

View reviewed changes

andrross merged commit b19e427 into opensearch-project:main Feb 16, 2024
30 checks passed

reta added the backport 2.x Backport to 2.x branch label Feb 16, 2024

opensearch-trigger-bot bot added the backport-failed label Feb 16, 2024

reta mentioned this pull request Feb 16, 2024

[Backport] [2.x] Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction (#12293) #12349

Merged

This was referenced Feb 29, 2024

[BUG] org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing flaky failure #9191

Closed

[BUG] org.opensearch.search.fetch.subphase.highlight.HighlighterSearchIT.testBoostingQueryTermVector is flaky #12119

Closed

BrewTestBot mentioned this pull request Apr 3, 2024

opensearch 2.13.0 Homebrew/homebrew-core#167852

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction #12293

Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction #12293

reta commented Feb 12, 2024

github-actions bot commented Feb 12, 2024 •

edited

Loading

github-actions bot commented Feb 12, 2024

reta commented Feb 12, 2024

github-actions bot commented Feb 12, 2024

github-actions bot commented Feb 12, 2024

github-actions bot commented Feb 12, 2024

codecov bot commented Feb 12, 2024 •

edited

Loading

reta commented Feb 13, 2024

github-actions bot commented Feb 13, 2024

github-actions bot commented Feb 13, 2024

github-actions bot commented Feb 13, 2024

reta commented Feb 13, 2024

github-actions bot commented Feb 14, 2024

reta commented Feb 14, 2024

github-actions bot commented Feb 14, 2024

reta commented Feb 14, 2024

reta commented Feb 15, 2024

opensearch-trigger-bot bot commented Feb 16, 2024

Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction #12293

Add support of special WrappingSearchAsyncActionPhase so the onPhaseStart() will always be followed by onPhaseEnd() within AbstractSearchAsyncAction #12293

Conversation

reta commented Feb 12, 2024

Description

Related Issues

Check List

github-actions bot commented Feb 12, 2024 • edited Loading

Compatibility status:

Incompatible components

Skipped components

Compatible components

github-actions bot commented Feb 12, 2024

reta commented Feb 12, 2024

github-actions bot commented Feb 12, 2024

github-actions bot commented Feb 12, 2024

github-actions bot commented Feb 12, 2024

codecov bot commented Feb 12, 2024 • edited Loading

Codecov Report

reta commented Feb 13, 2024

github-actions bot commented Feb 13, 2024

github-actions bot commented Feb 13, 2024

github-actions bot commented Feb 13, 2024

reta commented Feb 13, 2024

github-actions bot commented Feb 14, 2024

reta commented Feb 14, 2024

github-actions bot commented Feb 14, 2024

reta commented Feb 14, 2024

reta commented Feb 15, 2024

opensearch-trigger-bot bot commented Feb 16, 2024

github-actions bot commented Feb 12, 2024 •

edited

Loading

codecov bot commented Feb 12, 2024 •

edited

Loading