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

Add base class for parameterizing the search based tests #9083

Merged

Conversation

neetikasinghal
Copy link
Contributor

Description

Create a sub-class ConcurrentSearchIntegTestCase of OpenSearchIntegTestCase that has a constructor to work with the @ParametersFactory to create parameters’ values of the concurrent search cluster setting as true/false.
This PR contains the changes to only base classes for which the tests already exist in the main branch.
Changing all the other Search ITs to extend the new base class ConcurrentSearchIntegTestCase and initialize the base class constructor will be done in the follow-up PR as it involves changing a lot of classes.

Related Issues

Resolves #8673

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.

@neetikasinghal
Copy link
Contributor Author

@sohami @reta please review the changes.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

Gradle Check (Jenkins) Run Completed with:

@opensearch-trigger-bot
Copy link
Contributor

Compatibility status:



> Task :checkCompatibility
Incompatible components: [https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/security-analytics.git]
Compatible components: [https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/common-utils.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/cross-cluster-replication.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git]

BUILD SUCCESSFUL in 25m 13s

@codecov
Copy link

codecov bot commented Aug 11, 2023

Codecov Report

Merging #9083 (e41c46c) into main (8cecd5a) will increase coverage by 0.01%.
Report is 11 commits behind head on main.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main    #9083      +/-   ##
============================================
+ Coverage     71.10%   71.11%   +0.01%     
- Complexity    57415    57453      +38     
============================================
  Files          4775     4775              
  Lines        270700   270700              
  Branches      39566    39566              
============================================
+ Hits         192483   192516      +33     
+ Misses        62066    62011      -55     
- Partials      16151    16173      +22     
Files Changed Coverage Δ
...src/main/java/org/opensearch/ExceptionsHelper.java 82.71% <ø> (ø)
.../main/java/org/opensearch/OpenSearchException.java 89.44% <ø> (-1.67%) ⬇️
...rch/core/action/ShardOperationFailedException.java 100.00% <ø> (ø)
.../support/DefaultShardOperationFailedException.java 95.65% <ø> (ø)
...a/org/opensearch/core/common/ParsingException.java 96.66% <ø> (ø)
.../core/common/breaker/CircuitBreakingException.java 100.00% <ø> (ø)
.../opensearch/core/common/io/stream/StreamInput.java 89.04% <ø> (+1.36%) ⬆️
...opensearch/core/common/io/stream/StreamOutput.java 95.18% <ø> (+0.64%) ⬆️
...src/main/java/org/opensearch/core/index/Index.java 100.00% <ø> (ø)
.../java/org/opensearch/core/index/shard/ShardId.java 97.56% <ø> (ø)
... and 39 more

... and 471 files with indirect coverage changes

@neetikasinghal neetikasinghal force-pushed the concurrent-search-tests branch from 6df9416 to 133f993 Compare August 12, 2023 00:00
@opensearch-trigger-bot
Copy link
Contributor

Compatibility status:



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

BUILD SUCCESSFUL in 31m 18s

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@neetikasinghal
Copy link
Contributor Author

Gradle Check (Jenkins) Run Completed with:

testPreserveLatestCommit - this test is failing but looks unrelated to my changes.

@neetikasinghal neetikasinghal force-pushed the concurrent-search-tests branch from 133f993 to a34ecb8 Compare August 14, 2023 19:37
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Neetika Singhal <neetiks@amazon.com>
@neetikasinghal neetikasinghal force-pushed the concurrent-search-tests branch from a34ecb8 to e41c46c Compare August 14, 2023 21:14
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@neetikasinghal
Copy link
Contributor Author

Gradle Check (Jenkins) Run Completed with:

testRestoreInSameRemoteStoreEnabledIndex - flaky test

@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 added the backport 2.x Backport to 2.x branch label Aug 15, 2023
@andrross andrross merged commit 0a7eade into opensearch-project:main Aug 15, 2023
@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-9083-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0a7eade4664cebc23334822bbc1a426be379a50f
# Push it to GitHub
git push --set-upstream origin backport/backport-9083-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-9083-to-2.x.

andrross pushed a commit to andrross/OpenSearch that referenced this pull request Aug 15, 2023
…project#9083)

Signed-off-by: Neetika Singhal <neetiks@amazon.com>
(cherry picked from commit 0a7eade)
andrross pushed a commit to andrross/OpenSearch that referenced this pull request Aug 15, 2023
…project#9083)

Signed-off-by: Neetika Singhal <neetiks@amazon.com>
(cherry picked from commit 0a7eade)
kotwanikunal pushed a commit that referenced this pull request Aug 15, 2023
Signed-off-by: Neetika Singhal <neetiks@amazon.com>
(cherry picked from commit 0a7eade)

Co-authored-by: Neetika Singhal <neetiks@amazon.com>
kkmr pushed a commit to kkmr/OpenSearch that referenced this pull request Aug 28, 2023
…project#9083)

Signed-off-by: Neetika Singhal <neetiks@amazon.com>
Signed-off-by: Kiran Reddy <kkreddy@amazon.com>
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Sep 12, 2023
…project#9083)

Signed-off-by: Neetika Singhal <neetiks@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
…project#9083)

Signed-off-by: Neetika Singhal <neetiks@amazon.com>
Signed-off-by: Ivan Brusic <ivan.brusic@flocksafety.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…project#9083)

Signed-off-by: Neetika Singhal <neetiks@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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-failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proposal for Possible ways to run the search test suite with concurrent search enabled
5 participants