-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Rethrow OpenSearch exception in concurrent search #9177
Conversation
1c038ef
to
a8d09d4
Compare
Compatibility status:
|
server/src/main/java/org/opensearch/search/query/ConcurrentQueryPhaseSearcher.java
Show resolved
Hide resolved
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
...usterTest/java/org/opensearch/indices/memory/breaker/ConcurrentSearchRethrowExceptionIT.java
Outdated
Show resolved
Hide resolved
b0248ab
to
e7a4ce1
Compare
...Test/java/org/opensearch/indices/memory/breaker/ConcurrentSearchCircuitBreakerServiceIT.java
Outdated
Show resolved
Hide resolved
Compatibility status:
|
Gradle Check (Jenkins) Run Completed with:
|
...Test/java/org/opensearch/indices/memory/breaker/ConcurrentSearchCircuitBreakerServiceIT.java
Outdated
Show resolved
Hide resolved
e7a4ce1
to
09ac37e
Compare
Compatibility status:Checks if related components are compatible with change 0a7eade Incompatible componentsIncompatible components: [https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/security-analytics.git] Skipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git] |
Gradle Check (Jenkins) Run Completed with:
|
Signed-off-by: Neetika Singhal <neetiks@amazon.com>
09ac37e
to
eae57b2
Compare
Compatibility status:Checks if related components are compatible with change 152321b Incompatible componentsIncompatible components: [https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/security-analytics.git] Skipped componentsCompatible componentsCompatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/performance-analyzer-rca.git] |
Gradle Check (Jenkins) Run Completed with:
|
The backport to
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-9177-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4871e25ab7f5fac5b3c2ec19d937dad54e5a2a81
# Push it to GitHub
git push --set-upstream origin backport/backport-9177-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 |
…#9177) Signed-off-by: Neetika Singhal <neetiks@amazon.com>
…#9177) Signed-off-by: Neetika Singhal <neetiks@amazon.com> Signed-off-by: Kiran Reddy <kkreddy@amazon.com>
…#9177) Signed-off-by: Neetika Singhal <neetiks@amazon.com> Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
…#9177) Signed-off-by: Neetika Singhal <neetiks@amazon.com> Signed-off-by: Ivan Brusic <ivan.brusic@flocksafety.com>
…#9177) Signed-off-by: Neetika Singhal <neetiks@amazon.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Description
CircuitBreaker tests are breaking because of the difference in the Exceptions being thrown at the shard failure. The exceptions can be found below:
Shard failure exception with Concurrent Search
Shard failure exception without Concurrent Search
This PR attempts to fix this.
All tests report after this change(making sure that the other tests don't break with this change): link
Related Issues
Resolves #9124
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.