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

Shard id awareness of SearchLookup #1063

Merged

Conversation

anti-social
Copy link
Contributor

@anti-social anti-social commented Aug 9, 2021

Signed-off-by: Oleksandr Koval [email protected]

Description

Add shardId field for SearchLookup.

Issues Resolved

#1062

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.

@opensearch-ci-bot
Copy link
Collaborator

✅   DCO Check Passed a2be8c04219d7b6aaa8ee0a4107bfee73d1b00a4

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Wrapper Validation success a2be8c04219d7b6aaa8ee0a4107bfee73d1b00a4

@anti-social anti-social force-pushed the search-lookup-shard-id-awareness branch from a2be8c0 to 3314a80 Compare August 9, 2021 09:21
@opensearch-ci-bot
Copy link
Collaborator

✅   DCO Check Passed 3314a8069f91480db129fac4e0f92507ca42a768

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Precommit failure a2be8c04219d7b6aaa8ee0a4107bfee73d1b00a4
Log 902

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Wrapper Validation success 3314a8069f91480db129fac4e0f92507ca42a768

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Precommit success 3314a8069f91480db129fac4e0f92507ca42a768

@opensearch-ci-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@adnapibar
Copy link
Contributor

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 3314a8069f91480db129fac4e0f92507ca42a768
Log 671

Reports 671

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Wrapper Validation success 3314a8069f91480db129fac4e0f92507ca42a768

@opensearch-ci-bot
Copy link
Collaborator

✅   DCO Check Passed 3314a8069f91480db129fac4e0f92507ca42a768

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Precommit success 3314a8069f91480db129fac4e0f92507ca42a768

@anasalkouz
Copy link
Member

@anti-social , can you look into the failure and resolve the conflict.

@anti-social anti-social force-pushed the search-lookup-shard-id-awareness branch from 3314a80 to 5c971a9 Compare November 2, 2021 09:57
@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Wrapper Validation success 5c971a9754d3cf3dbe4f9beecd66e7c8acf076fd

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Precommit success 5c971a9754d3cf3dbe4f9beecd66e7c8acf076fd

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 5c971a9754d3cf3dbe4f9beecd66e7c8acf076fd
Log 950

Reports 950

@anti-social
Copy link
Contributor Author

Think this test are not related to the changes:

org.opensearch.cluster.ClusterHealthIT > testHealthOnMasterFailover FAILED

./gradlew :server:internalClusterTest --tests "org.opensearch.cluster.ClusterHealthIT.testHealthOnMasterFailover" passed on my machine.

Possibly checks should be retried.

@tlfeng
Copy link
Collaborator

tlfeng commented Nov 5, 2021

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 5c971a9754d3cf3dbe4f9beecd66e7c8acf076fd
Log 991

Reports 991

@anti-social anti-social force-pushed the search-lookup-shard-id-awareness branch from 5c971a9 to 4254bab Compare November 8, 2021 11:18
@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Wrapper Validation success 4254bab

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Precommit success 4254bab

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 4254bab
Log 1006

Reports 1006

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 4254bab
Log 1425

Reports 1425

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 4254bab
Log 1473

Reports 1473

dblock
dblock previously requested changes Mar 7, 2022
Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anti-social Could you please explain what this is for? I imagine you want to pass in an actual shard ID sometimes, so it seems at least that this PR still needs tests for searches with a known shard ID. And maybe default the value to UNKNOWN_SHARD_ID in the public interfaces.

@anti-social anti-social force-pushed the search-lookup-shard-id-awareness branch from bce8154 to 1b55506 Compare February 20, 2024 10:57
Copy link
Contributor

✅ Gradle check result for 1b55506: SUCCESS

Copy link

codecov bot commented Feb 20, 2024

Codecov Report

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

Comparison is base (a50d1f6) 71.38% compared to head (49ddd28) 71.37%.
Report is 1 commits behind head on main.

Files Patch % Lines
.../org/opensearch/index/query/QueryShardContext.java 50.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #1063      +/-   ##
============================================
- Coverage     71.38%   71.37%   -0.01%     
- Complexity    59848    59891      +43     
============================================
  Files          4972     4972              
  Lines        281774   281781       +7     
  Branches      40910    40910              
============================================
- Hits         201138   201116      -22     
- Misses        63973    63999      +26     
- Partials      16663    16666       +3     

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

@anti-social
Copy link
Contributor Author

@andrross @msfroh Could you review it?

@andrross andrross added the backport 2.x Backport to 2.x branch label Feb 21, 2024
@andrross andrross force-pushed the search-lookup-shard-id-awareness branch from 1b55506 to caea317 Compare February 21, 2024 23:55
@andrross
Copy link
Member

I added a unit test for the deprecated constructor behavior, and made a cosmetic change to another unit test. @msfroh can you take a look and merge if it looks good to you?

@andrross andrross dismissed dblock’s stale review February 21, 2024 23:57

Comments have been addressed

Copy link
Contributor

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

@andrross andrross force-pushed the search-lookup-shard-id-awareness branch from caea317 to e45ff9b Compare February 22, 2024 01:08
Copy link
Contributor

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

@andrross andrross force-pushed the search-lookup-shard-id-awareness branch from e45ff9b to 49ddd28 Compare February 22, 2024 18:19
Copy link
Contributor

❕ Gradle check result for 49ddd28: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.multipart.RemoteStoreMultipartIT.testNoSearchIdleForAnyReplicaCount

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

@msfroh msfroh merged commit 87ac374 into opensearch-project:main Feb 22, 2024
30 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:

# 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-1063-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 87ac37460c16a5b3cfa1cd85cad2cb7468b430a3
# Push it to GitHub
git push --set-upstream origin backport/backport-1063-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-1063-to-2.x.

andrross pushed a commit to andrross/OpenSearch that referenced this pull request Feb 22, 2024
* Shard id awareness of SearchLookup

Signed-off-by: Alexander Koval <[email protected]>

* Add unit test for deprecated constructor

Signed-off-by: Andrew Ross <[email protected]>

---------

Signed-off-by: Alexander Koval <[email protected]>
Signed-off-by: Andrew Ross <[email protected]>
Co-authored-by: Andrew Ross <[email protected]>
(cherry picked from commit 87ac374)
andrross pushed a commit to andrross/OpenSearch that referenced this pull request Feb 23, 2024
* Shard id awareness of SearchLookup

Signed-off-by: Alexander Koval <[email protected]>

* Add unit test for deprecated constructor

Signed-off-by: Andrew Ross <[email protected]>

---------

Signed-off-by: Alexander Koval <[email protected]>
Signed-off-by: Andrew Ross <[email protected]>
Co-authored-by: Andrew Ross <[email protected]>
(cherry picked from commit 87ac374)
kotwanikunal pushed a commit that referenced this pull request Feb 27, 2024
* Shard id awareness of SearchLookup

Signed-off-by: Alexander Koval <[email protected]>

* Add unit test for deprecated constructor

Signed-off-by: Andrew Ross <[email protected]>

---------

Signed-off-by: Alexander Koval <[email protected]>
Signed-off-by: Andrew Ross <[email protected]>
Co-authored-by: Andrew Ross <[email protected]>
(cherry picked from commit 87ac374)

Co-authored-by: Alexander <[email protected]>
peteralfonsi pushed a commit to peteralfonsi/OpenSearch that referenced this pull request Mar 1, 2024
* Shard id awareness of SearchLookup

Signed-off-by: Alexander Koval <[email protected]>

* Add unit test for deprecated constructor

Signed-off-by: Andrew Ross <[email protected]>

---------

Signed-off-by: Alexander Koval <[email protected]>
Signed-off-by: Andrew Ross <[email protected]>
Co-authored-by: Andrew Ross <[email protected]>
amkhar pushed a commit to amkhar/OpenSearch that referenced this pull request Mar 12, 2024
* Shard id awareness of SearchLookup

Signed-off-by: Alexander Koval <[email protected]>

* Add unit test for deprecated constructor

Signed-off-by: Andrew Ross <[email protected]>

---------

Signed-off-by: Alexander Koval <[email protected]>
Signed-off-by: Andrew Ross <[email protected]>
Co-authored-by: Andrew Ross <[email protected]>
Signed-off-by: Aman Khare <[email protected]>
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
* Shard id awareness of SearchLookup

Signed-off-by: Alexander Koval <[email protected]>

* Add unit test for deprecated constructor

Signed-off-by: Andrew Ross <[email protected]>

---------

Signed-off-by: Alexander Koval <[email protected]>
Signed-off-by: Andrew Ross <[email protected]>
Co-authored-by: Andrew Ross <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
* Shard id awareness of SearchLookup

Signed-off-by: Alexander Koval <[email protected]>

* Add unit test for deprecated constructor

Signed-off-by: Andrew Ross <[email protected]>

---------

Signed-off-by: Alexander Koval <[email protected]>
Signed-off-by: Andrew Ross <[email protected]>
Co-authored-by: Andrew Ross <[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
Projects
None yet
Development

Successfully merging this pull request may close these issues.