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

Create separate SourceLookup instance per segment slice in SignificantTextAggregatorFactory #8807

Merged
merged 2 commits into from
Jul 25, 2023

Conversation

jed326
Copy link
Collaborator

@jed326 jed326 commented Jul 20, 2023

Description

PR contains 2 changes in separate commits:

  1. Remove flakey assertion from SearchTimeoutIT.
  2. Make SourceLookup thread safe in SignificantTextAggregatorFactory by creating a new SourceLookup for each aggregator.

Related Issues

Resolves #8790
Resolves #8509

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Jul 20, 2023

Codecov Report

Merging #8807 (0e8e1f9) into main (5d78de6) will increase coverage by 0.18%.
The diff coverage is 79.31%.

@@             Coverage Diff              @@
##               main    #8807      +/-   ##
============================================
+ Coverage     70.98%   71.17%   +0.18%     
- Complexity    57166    57255      +89     
============================================
  Files          4757     4757              
  Lines        269823   269832       +9     
  Branches      39474    39478       +4     
============================================
+ Hits         191536   192050     +514     
+ Misses        62158    61572     -586     
- Partials      16129    16210      +81     
Files Changed Coverage Δ
...org/opensearch/index/seqno/ReplicationTracker.java 68.65% <77.77%> (-0.62%) ⬇️
.../replication/checkpoint/ReplicationCheckpoint.java 87.71% <100.00%> (+2.00%) ⬆️
...bucket/terms/SignificantTextAggregatorFactory.java 92.47% <100.00%> (-0.09%) ⬇️

... and 464 files with indirect coverage changes

@jed326
Copy link
Collaborator Author

jed326 commented Jul 20, 2023

@sohami @reta @andrross could you please help review this PR? Thanks!

CHANGELOG.md Outdated Show resolved Hide resolved
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testStartReplicaAfterPrimaryIndexesDocs
      1 org.opensearch.cluster.allocation.AwarenessAllocationIT.testThreeZoneOneReplicaWithForceZoneValueAndLoadAwareness

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@andrross andrross changed the title Sigterms 8790 Create separate SourceLookup instance per segment slice in SignificantTextAggregatorFactory Jul 25, 2023
@andrross andrross added backport 2.x Backport to 2.x branch v2.10.0 labels Jul 25, 2023
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@andrross andrross merged commit b9b5e5c into opensearch-project:main Jul 25, 2023
10 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-8807-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b9b5e5c676150f1148c2eb9306e3ce1c8a57c87c
# Push it to GitHub
git push --set-upstream origin backport/backport-8807-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-8807-to-2.x.

jed326 added a commit to jed326/OpenSearch that referenced this pull request Jul 25, 2023
…tTextAggregatorFactory (opensearch-project#8807)

* Remove flakey assertion in SearchTimeoutIT

Signed-off-by: Jay Deng <[email protected]>

* Create separate SourceLookup instance per segment slice in SignificantTextAggregatorFactory

Signed-off-by: Jay Deng <[email protected]>

---------

Signed-off-by: Jay Deng <[email protected]>
andrross pushed a commit that referenced this pull request Jul 25, 2023
…tTextAggregatorFactory (#8807) (#8880)

* Remove flakey assertion in SearchTimeoutIT



* Create separate SourceLookup instance per segment slice in SignificantTextAggregatorFactory



---------

Signed-off-by: Jay Deng <[email protected]>
baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
…tTextAggregatorFactory (opensearch-project#8807)

* Remove flakey assertion in SearchTimeoutIT

Signed-off-by: Jay Deng <[email protected]>

* Create separate SourceLookup instance per segment slice in SignificantTextAggregatorFactory

Signed-off-by: Jay Deng <[email protected]>

---------

Signed-off-by: Jay Deng <[email protected]>
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Sep 12, 2023
…tTextAggregatorFactory (opensearch-project#8807)

* Remove flakey assertion in SearchTimeoutIT

Signed-off-by: Jay Deng <[email protected]>

* Create separate SourceLookup instance per segment slice in SignificantTextAggregatorFactory

Signed-off-by: Jay Deng <[email protected]>

---------

Signed-off-by: Jay Deng <[email protected]>
Signed-off-by: Kaushal Kumar <[email protected]>
@jed326 jed326 deleted the sigterms-8790 branch September 13, 2023 19:10
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
…tTextAggregatorFactory (opensearch-project#8807)

* Remove flakey assertion in SearchTimeoutIT

Signed-off-by: Jay Deng <[email protected]>

* Create separate SourceLookup instance per segment slice in SignificantTextAggregatorFactory

Signed-off-by: Jay Deng <[email protected]>

---------

Signed-off-by: Jay Deng <[email protected]>
Signed-off-by: Ivan Brusic <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…tTextAggregatorFactory (opensearch-project#8807)

* Remove flakey assertion in SearchTimeoutIT

Signed-off-by: Jay Deng <[email protected]>

* Create separate SourceLookup instance per segment slice in SignificantTextAggregatorFactory

Signed-off-by: Jay Deng <[email protected]>

---------

Signed-off-by: Jay Deng <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
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 v2.10.0
Projects
None yet
4 participants