Skip to content

Commit 2566e7b

Browse files
IanHoangdosa-chammandicgchinmayOVI3D0finnroblin
committed
Rebase renamed-components onto latest developments (opensearch-project#882)
Signed-off-by: vivek palakkat <[email protected]> Signed-off-by: Chinmay Gadgil <[email protected]> Signed-off-by: Ian Hoang <[email protected]> Signed-off-by: Finn Roblin <[email protected]> Signed-off-by: Martin Gaievski <[email protected]> Signed-off-by: Govind Kamat <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: Junqiu Lei <[email protected]> Signed-off-by: Michael Oviedo <[email protected]> Signed-off-by: Ian Hoang <[email protected]> Signed-off-by: Finn Roblin <[email protected]> Signed-off-by: Vijayan Balasubramanian <[email protected]> Signed-off-by: Peter Alfonsi <[email protected]> Signed-off-by: Rishabh Singh <[email protected]> Co-authored-by: dosa_chammandi <[email protected]> Co-authored-by: Chinmay Gadgil <[email protected]> Co-authored-by: Michael Oviedo <[email protected]> Co-authored-by: Finn <[email protected]> Co-authored-by: Ian Hoang <[email protected]> Co-authored-by: Martin Gaievski <[email protected]> Co-authored-by: Govind Kamat <[email protected]> Co-authored-by: Peter Zhu <[email protected]> Co-authored-by: Junqiu Lei <[email protected]> Co-authored-by: Vijayan Balasubramanian <[email protected]> Co-authored-by: Peter Alfonsi <[email protected]> Co-authored-by: Peter Alfonsi <[email protected]> Co-authored-by: Rishabh Singh <[email protected]> Signed-off-by: Ian Hoang <[email protected]>
1 parent bfac821 commit 2566e7b

File tree

175 files changed

+1649
-1649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+1649
-1649
lines changed

CREATE_WORKLOAD_GUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ By default, workloads created will come with the following operations run in the
5353

5454
To invoke the newly created workload, run the following:
5555
```
56-
$ opensearch-benchmark execute_test \
56+
$ opensearch-benchmark run-test \
5757
--pipeline="benchmark-only" \
5858
--workload-path="<PATH OUTPUTTED IN THE OUTPUT OF THE CREATE-WORKLOAD COMMAND>" \
5959
--target-host="<CLUSTER ENDPOINT>" \

DEVELOPER_GUIDE.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This document will walk you through on what's needed to start contributing code
88
- [Setup](#setup)
99
- [Importing the project into an IDE](#importing-the-project-into-an-ide)
1010
- [Setting Up a Local OpenSearch Cluster For OSB Development (Optional)](#setting-up-a-local-opensearch-cluster-for-osb-development-optional)
11-
- [Executing tests](#executing-tests)
11+
- [running tests](#running-tests)
1212
- [Unit tests](#unit-tests)
1313
- [Integration tests](#integration-tests)
1414
- [Submitting your changes for a pull request](#submitting-your-changes-for-a-pull-request)
@@ -28,7 +28,7 @@ This document will walk you through on what's needed to start contributing code
2828

2929
`pyenv` requires that the C compiler and development libraries be installed, so that the specified Python versions can be build from source. The installation instructions vary from platform to platform.
3030

31-
For Debian-based systems, install the following modules to continue with the next steps:
31+
For Debian-based systems, install the following modules to continue with the next steps:
3232
```
3333
sudo apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \
3434
libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
@@ -65,9 +65,9 @@ This document will walk you through on what's needed to start contributing code
6565
6666
### Setup
6767
68-
To develop OSB properly, it is recommended that you fork the official OpenSearch Benchmark repository.
68+
To develop OSB properly, it is recommended that you fork the official OpenSearch Benchmark repository.
6969
70-
For those working on WSL2, it is recommended to clone the repository and set up the working environment within the Linux subsystem. Refer to the guide for setting up WSL2 on [Visual Studio Code](https://code.visualstudio.com/docs/remote/wsl) or [PyCharm](https://www.jetbrains.com/help/pycharm/using-wsl-as-a-remote-interpreter.html#create-wsl-interpreter).
70+
For those working on WSL2, it is recommended to clone the repository and set up the working environment within the Linux subsystem. Refer to the guide for setting up WSL2 on [Visual Studio Code](https://code.visualstudio.com/docs/remote/wsl) or [PyCharm](https://www.jetbrains.com/help/pycharm/using-wsl-as-a-remote-interpreter.html#create-wsl-interpreter).
7171
7272
After you git cloned the forked copy of OpenSearch Benchmark, use the following command-line instructions to set up OpenSearch Benchmark for development:
7373
```
@@ -98,9 +98,9 @@ In order to run tests within the PyCharm IDE, ensure the `Python Integrated Tool
9898
9999
## Setting Up a Local OpenSearch Cluster For OSB Development (Optional)
100100
101-
### OpenSearch Installation
101+
### OpenSearch Installation
102102
103-
Download the latest release of OpenSearch from https://opensearch.org/downloads.html. If you are using WSL, make sure to download it into your `/home/<user>` directory instead of `/mnt/c`.
103+
Download the latest release of OpenSearch from https://opensearch.org/downloads.html. If you are using WSL, make sure to download it into your `/home/<user>` directory instead of `/mnt/c`.
104104
```
105105
wget https://artifacts.opensearch.org/releases/bundle/opensearch/<x.x.x>/opensearch-<x.x.x>-linux-x64.tar.gz
106106
tar -xf opensearch-x.x.x-linux-x64.tar.gz
@@ -110,17 +110,17 @@ NOTE: Have Docker running in the background for the next steps. Refer to the ins
110110
111111
### OpenSearch Cluster setup
112112
113-
Add the following settings to the `opensearch.yml` file under the config directory
113+
Add the following settings to the `opensearch.yml` file under the config directory
114114
```
115115
vim config/opensearch.yml
116116
```
117117
```
118118
#
119-
discovery.type: single-node
120-
plugins.security.disabled: true
119+
discovery.type: single-node
120+
plugins.security.disabled: true
121121
#
122122
```
123-
Run the opensearch-tar-install.sh script to install and setup a cluster for our use.
123+
Run the opensearch-tar-install.sh script to install and setup a cluster for our use.
124124
```
125125
bash opensearch-tar-install.sh
126126
```
@@ -146,25 +146,25 @@ Check the output of `curl.exe "http://localhost:9200/_cluster/health?pretty"`. O
146146
"active_shards_percent_as_number" : 100.0
147147
}
148148
```
149-
Now, you have a local cluster running! You can connect to this and run the workload for the next step.
149+
Now, you have a local cluster running! You can connect to this and run the workload for the next step.
150150
151151
### Running Workloads on a locally installed Cluster
152152
153-
Here's a sample executation of the geonames benchmark which can be found from the [workloads](https://github.com/opensearch-project/opensearch-benchmark-workloads) repo.
153+
Here's a sample run of the geonames benchmark which can be found from the [workloads](https://github.com/opensearch-project/opensearch-benchmark-workloads) repo.
154154
```
155-
opensearch-benchmark execute-test --pipeline=benchmark-only --workload=geonames --target-host=127.0.0.1:9200 --test-mode --workload-params '{"number_of_shards":"1","number_of_replicas":"0"}'
155+
opensearch-benchmark run-test --pipeline=benchmark-only --workload=geonames --target-host=127.0.0.1:9200 --test-mode --workload-params '{"number_of_shards":"1","number_of_replicas":"0"}'
156156
```
157157
158158
And we're done! You should be seeing the performance metrics soon enough!
159159
160-
### Debugging
160+
### Debugging
161161
162-
**If you are not seeing any results, it should be an indicator that there is an issue with your cluster setup or the way the manager is accessing it**. Use the command below to view the logs.
162+
**If you are not seeing any results, it should be an indicator that there is an issue with your cluster setup or the way the manager is accessing it**. Use the command below to view the logs.
163163
```
164164
tail -f ~/.benchmark/logs/benchmark.log
165165
```
166166
167-
## Executing tests
167+
## running tests
168168
169169
Once setup is complete, you may run the unit and integration tests.
170170
@@ -230,7 +230,7 @@ make install
230230
To streamline the process, please refer to [this guide](https://github.com/opensearch-project/opensearch-benchmark/blob/main/PYTHON_SUPPORT_GUIDE.md)
231231
232232
### Debugging OpenSearch Benchmark in Developer Mode
233-
Many users find that the simplest way to debug OpenSearch Benchmark is by using developer mode. Users can activate developer mode by running `python3 -m pip install -e .` within the cloned OpenSearch Benchmark repository. Any changes made and saved will be reflected when OpenSearch Benchmark is run. Users can add loggers or print statements and see the changes reflected in subsequent runs.
233+
Many users find that the simplest way to debug OpenSearch Benchmark is by using developer mode. Users can activate developer mode by running `python3 -m pip install -e .` within the cloned OpenSearch Benchmark repository. Any changes made and saved will be reflected when OpenSearch Benchmark is run. Users can add loggers or print statements and see the changes reflected in subsequent runs.
234234
235235
### Debugging Unittests in Visual Studio Code
236236
To run and debug unittests in Visual Studio Code, add the following configuration to the Python Debugger `launch.json` file. See [the official Visual Studio Code documentation](https://code.visualstudio.com/docs/editor/debugging) for more information on setting up and accessing `launch.json` file.

PYTHON_SUPPORT_GUIDE.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ supported_python_versions = [(3, 8), (3, 9), (3, 10), (3, 11), (3, 12)]
2727

2828
**Basic OpenSearch Benchmark command with distribution version and test mode**
2929
```
30-
opensearch-benchmark execute-test --distribution-version=1.0.0 --workload=geonames --test-mode
30+
opensearch-benchmark run-test --distribution-version=1.0.0 --workload=geonames --test-mode
3131
```
3232

33-
**OpenSearch Benchmark command executing test on target-host in test mode**
33+
**OpenSearch Benchmark command running test on target-host in test mode**
3434
```
35-
opensearch-benchmark execute-test --workload=geonames --pipeline=benchmark-only --target-host="<OPENSEARCH CLUSTER ENDPOINT>" --client-options="basic_auth_user:'<USERNAME>',basic_auth_password:'<PASSWORD>'" --test-mode"
35+
opensearch-benchmark run-test --workload=geonames --pipeline=benchmark-only --target-host="<OPENSEARCH CLUSTER ENDPOINT>" --client-options="basic_auth_user:'<USERNAME>',basic_auth_password:'<PASSWORD>'" --test-mode"
3636
```
3737

38-
**OpenSearch-Benchmark command executing test on target-host without test mode**
38+
**OpenSearch-Benchmark command running test on target-host without test mode**
3939
```
40-
opensearch-benchmark execute-test --workload=geonames --pipeline=benchmark-only --target-host="<OPENSEARCH CLUSTER ENDPOINT>" --client-options="basic_auth_user:'<USERNAME>',basic_auth_password:'<PASSWORD>'"
40+
opensearch-benchmark run-test --workload=geonames --pipeline=benchmark-only --target-host="<OPENSEARCH CLUSTER ENDPOINT>" --client-options="basic_auth_user:'<USERNAME>',basic_auth_password:'<PASSWORD>'"
4141
```
4242

4343
To ensure that users are using the correct python versions, install the repository with `python3 -m pip install -e .` and run `which opensearch-benchmark` to get the path. Pre-append this path to each of the three commands above and re-run them in the command line.
@@ -46,12 +46,12 @@ Keep in mind the file path outputted differs for each operating system and might
4646

4747
- For example: When running `which opensearch-benchmark` on an Ubuntu environment, the commad line outputs `/home/ubuntu/.pyenv/shims/opensearch-benchmark`. On closer inspection, the path points to a shell script. Thus, to invoke OpenSearch Benchmark, pre-=append the OpenSearch Benchmark command with `bash` and the path outputted earlier:
4848
```
49-
bash -x /home/ubuntu/.pyenv/shims/opensearch-benchmark execute-test --workload=geonames --pipeline=benchmark-only --target-host="<OPENSEARCH CLUSTER ENDPOINT>" --client-options="basic_auth_user:'<USERNAME>',basic_auth_password:'<PASSWORD>'"
49+
bash -x /home/ubuntu/.pyenv/shims/opensearch-benchmark run-test --workload=geonames --pipeline=benchmark-only --target-host="<OPENSEARCH CLUSTER ENDPOINT>" --client-options="basic_auth_user:'<USERNAME>',basic_auth_password:'<PASSWORD>'"
5050
```
5151

5252
- Another example: When running `which opensearch-benchmark` on an Amazon Linux 2 environment, the command line outputs `~/.local/bin/opensearch-benchmark`. On closer inspection, the path points to a Python script. Thus, to invoke OpenSearch Benchmark, pre-append the OpenSearch Benchmark command with `python3` and the path outputted earlier:
5353
```
54-
python3 ~/.local/bin/opensearch-benchmark execute-test --workload=geonames --pipeline=benchmark-only --target-host="<OPENSEARCH CLUSTER ENDPOINT>" --client-options="basic_auth_user:'<USERNAME>',basic_auth_password:'<PASSWORD>'"
54+
python3 ~/.local/bin/opensearch-benchmark run-test --workload=geonames --pipeline=benchmark-only --target-host="<OPENSEARCH CLUSTER ENDPOINT>" --client-options="basic_auth_user:'<USERNAME>',basic_auth_password:'<PASSWORD>'"
5555
```
5656

5757
### Creating a Pull Request After Adding Changes and Testing Them Out

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ Unless required by applicable law or agreed to in writing, software
6464
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
6565
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
6666
License for the specific language governing permissions and limitations under
67-
the License.
67+
the License.

RELEASE_GUIDE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Add backport labels to PRs and commits so that changes can be added to `main` br
4343
* Since releases are generally published on Thursdays, maintainers should try to ensure all changes are merged in by Tuesday.
4444
* A week prior to the scheduled release, maintainers should announce the fact in the [#performance channel](https://opensearch.slack.com/archives/C0516H8EJ7R) within the OpenSearch Slack community.
4545
* Ensure that documentation is appropriately updated with respect to incoming changes prior to the release.
46-
46+
4747
## Release the new version of OpenSearch Benchmark to PyPI, Docker, and ECR
4848

4949
1. Clone the official OpenSearch Benchmark git repository and change directory to it. This is where the following commands will be issued.
@@ -123,7 +123,7 @@ Send this message in the following channels in OpenSearch Community Slack:
123123

124124
If an error occurs during build process and you need to retrigger the workflow, do the following:
125125

126-
* Delete the tag locally: `git tag -d <VERSION>`
126+
* Delete the tag locally: `git tag -d <VERSION>`
127127
* Delete the tag on GitHub: `git push --delete origin <VERSION>`
128128
* Delete the draft release on GitHub
129129
* Create the tag again and push it to re-initiate the release process.

0 commit comments

Comments
 (0)