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 procedures to split indexing, search and merge #230

Merged
merged 2 commits into from
Mar 18, 2024

Conversation

VijayanB
Copy link
Member

@VijayanB VijayanB commented Mar 8, 2024

Description

For large dataset, users might prefer to do indexing, search, force merge as different test execution. To support this use case, added three additional procedure,
1)index only, 2)force-merge 3)search-only. This can be used in nightly to run search workload every day without indexing everytime.

Integration test is executed here: https://github.com/VijayanB/opensearch-benchmark/actions/runs/8256914251

Issues Resolved

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.

Copy link
Collaborator

@gkamat gkamat left a comment

Choose a reason for hiding this comment

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

Please add information on these new test procedures in the README. If this workload is to be backported to the 1, 2 and 3 branches, please add the corresponding backport labels.

Can you also indicate in the description that you have run the integ tests as indicated here? This is needed for approval -- thanks.

Also, you may want to move the different phases each into a separate file in the test procedures directory and include them in the appropriate test procedures to avoid code duplication. For instance, the force-merge section could be shared amongst both the no-train-test and force-merge procedures.

For large dataset, users might prefer to do indexing,
search, force merge as different test execution. To support
this use case, added three additional procedure,
1)index only, 2)force-merge 3)search-only. This can be used
in nightly to run search workload every day without indexing
everytime.

Signed-off-by: Vijayan Balasubramanian <[email protected]>
@VijayanB VijayanB force-pushed the add-procedures branch 4 times, most recently from 3e9a381 to 2086e32 Compare March 11, 2024 22:10
Signed-off-by: Vijayan Balasubramanian <[email protected]>
@VijayanB
Copy link
Member Author

@gkamat Thanks for feedback. I updated procedure with your suggestion. Can you take a look one more time? Thanks

@VijayanB VijayanB requested a review from gkamat March 11, 2024 23:25
Copy link
Collaborator

@gkamat gkamat left a comment

Choose a reason for hiding this comment

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

As mentioned in my prior comment, please indicate in the PR description that you have run the OpenSearch Benchmark integration tests prior to merging this change. Although this is a different repository, the tests can fail if there are issues with the workload. Also indicate which versions of OpenSearch this workload is targeting.

@IanHoang IanHoang added backport 2 Backport to the "2" branch backport 1 backport 3 Backport to the "3" branch labels Mar 12, 2024
@VijayanB
Copy link
Member Author

VijayanB commented Mar 12, 2024

@gkamat It should work on 1.x 2.x and main . Will update with it results

@VijayanB
Copy link
Member Author

@VijayanB
Copy link
Member Author

@gkamat i followed the steps and shared the execution result. However i am not sure how the test will pickup main branch from workloads.

@gkamat
Copy link
Collaborator

gkamat commented Mar 18, 2024

@gkamat i followed the steps and shared the execution result. However i am not sure how the test will pickup main branch from workloads.

The test will not pick up the main (i.e., the development) branch. It only uses branches 1 and 2 since those are the only versions of OpenSearch currently available.

@gkamat gkamat merged commit ee08633 into opensearch-project:main Mar 18, 2024
5 checks passed
@opensearch-trigger-bot
Copy link

The backport to 2 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 2
# Navigate to the new working tree
pushd ../.worktrees/backport-2
# Create a new branch
git switch --create backport/backport-230-to-2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ee086332fe6f73d87f0cb90d67ed77db5359f807
# Push it to GitHub
git push --set-upstream origin backport/backport-230-to-2
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2

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

@opensearch-trigger-bot
Copy link

The backport to 1 failed:

The process '/usr/bin/git' failed with exit code 1

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-1 1
# Navigate to the new working tree
pushd ../.worktrees/backport-1
# Create a new branch
git switch --create backport/backport-230-to-1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ee086332fe6f73d87f0cb90d67ed77db5359f807
# Push it to GitHub
git push --set-upstream origin backport/backport-230-to-1
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1

Then, create a pull request where the base branch is 1 and the compare/head branch is backport/backport-230-to-1.

@opensearch-trigger-bot
Copy link

The backport to 3 failed:

The process '/usr/bin/git' failed with exit code 1

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-3 3
# Navigate to the new working tree
pushd ../.worktrees/backport-3
# Create a new branch
git switch --create backport/backport-230-to-3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ee086332fe6f73d87f0cb90d67ed77db5359f807
# Push it to GitHub
git push --set-upstream origin backport/backport-230-to-3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-3

Then, create a pull request where the base branch is 3 and the compare/head branch is backport/backport-230-to-3.

This was referenced Mar 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1 backport 2 Backport to the "2" branch backport 3 Backport to the "3" branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants