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 configurable throughput and client parameters to http logs workload #384

Merged
merged 8 commits into from
Sep 19, 2024

Conversation

OVI3D0
Copy link
Member

@OVI3D0 OVI3D0 commented Sep 12, 2024

Description

Adds configurable throughput and client parameters to the http_logs workload for OSB

Issues Resolved

#124

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.

OVI3D0 added 7 commits August 21, 2024 17:37
Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
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.

Didn't go through all the changes per se, but approving the scheme used. Hopefully, the modifications were made with a script or editor macro, so that no errors/typos crept in.

Please add labels to specify the branches this change should be backported to.

@IanHoang IanHoang added backport 2 Backport to the "2" branch backport 1 backport 3 Backport to the "3" branch backport 7 Backport to the "7" branch labels Sep 16, 2024
Copy link
Collaborator

@IanHoang IanHoang left a comment

Choose a reason for hiding this comment

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

LGTM

@OVI3D0
Copy link
Member Author

OVI3D0 commented Sep 16, 2024

Didn't go through all the changes per se, but approving the scheme used. Hopefully, the modifications were made with a script or editor macro, so that no errors/typos crept in.

Please add labels to specify the branches this change should be backported to.

I tested these changes with the integration tests in Opensearch Benchmark and they passed, so there should be no errors :)

… geopointshape, geoshape

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
@IanHoang IanHoang merged commit 4d5ae33 into opensearch-project:main Sep 19, 2024
2 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 19, 2024
…ad (#384)

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters to http logs

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix jinja2 expressions

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix 200s + 400s variables

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client params for geonames, geopoint, geopointshape, geoshape

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
(cherry picked from commit 4d5ae33)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link

The backport to 1 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-1 1
# Navigate to the new working tree
pushd ../.worktrees/backport-1
# Create a new branch
git switch --create backport/backport-384-to-1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4d5ae33e22e7159d166a799c80eb16b45d7e67d5
# Push it to GitHub
git push --set-upstream origin backport/backport-384-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-384-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-384-to-3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4d5ae33e22e7159d166a799c80eb16b45d7e67d5
# Push it to GitHub
git push --set-upstream origin backport/backport-384-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-384-to-3.

@opensearch-trigger-bot
Copy link

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

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

IanHoang pushed a commit that referenced this pull request Sep 19, 2024
…ad (#384) (#389)

* add configurable throughput and client parameters



* add configurable throughput and client parameters



* add configurable throughput and client parameters to http logs



* fix jinja2 expressions



* fix 200s + 400s variables



* add configurable throughput and client params for geonames, geopoint, geopointshape, geoshape



---------


(cherry picked from commit 4d5ae33)

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
OVI3D0 added a commit to OVI3D0/opensearch-benchmark-workloads that referenced this pull request Sep 19, 2024
…ad (opensearch-project#384)

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters to http logs

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix jinja2 expressions

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix 200s + 400s variables

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client params for geonames, geopoint, geopointshape, geoshape

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
OVI3D0 added a commit to OVI3D0/opensearch-benchmark-workloads that referenced this pull request Sep 19, 2024
…ad (opensearch-project#384)

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters to http logs

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix jinja2 expressions

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix 200s + 400s variables

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client params for geonames, geopoint, geopointshape, geoshape

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
OVI3D0 added a commit to OVI3D0/opensearch-benchmark-workloads that referenced this pull request Sep 19, 2024
…ad (opensearch-project#384)

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters to http logs

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix jinja2 expressions

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix 200s + 400s variables

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client params for geonames, geopoint, geopointshape, geoshape

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
IanHoang pushed a commit that referenced this pull request Sep 19, 2024
…ad (#384) (#390)

* add configurable throughput and client parameters



* add configurable throughput and client parameters



* add configurable throughput and client parameters to http logs



* fix jinja2 expressions



* fix 200s + 400s variables



* add configurable throughput and client params for geonames, geopoint, geopointshape, geoshape



---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
IanHoang pushed a commit that referenced this pull request Sep 19, 2024
…ad (#384) (#391)

* add configurable throughput and client parameters



* add configurable throughput and client parameters



* add configurable throughput and client parameters to http logs



* fix jinja2 expressions



* fix 200s + 400s variables



* add configurable throughput and client params for geonames, geopoint, geopointshape, geoshape



---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
IanHoang pushed a commit that referenced this pull request Sep 19, 2024
…ad (#384) (#392)

* add configurable throughput and client parameters



* add configurable throughput and client parameters



* add configurable throughput and client parameters to http logs



* fix jinja2 expressions



* fix 200s + 400s variables



* add configurable throughput and client params for geonames, geopoint, geopointshape, geoshape



---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
IanHoang pushed a commit that referenced this pull request Sep 20, 2024
* Add configurable throughput and client parameters to http logs workload (#384)

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters to http logs

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix jinja2 expressions

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix 200s + 400s variables

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client params for geonames, geopoint, geopointshape, geoshape

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client params to nested, noaa, pmc workloads (#406)

* add configurable throughput and client params to nested, noaa, pmc workloads

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix http_logs operation value + add name field

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
IanHoang pushed a commit that referenced this pull request Sep 20, 2024
* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (#406)"

This reverts commit e7d14b6.

Signed-off-by: Andre Kurait <akurait@amazon.com>

* Revert "Add configurable throughput and client parameters to http logs workload (#384)"

This reverts commit 4d5ae33.

Signed-off-by: Andre Kurait <akurait@amazon.com>

---------

Signed-off-by: Andre Kurait <akurait@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 20, 2024
* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (#406)"

This reverts commit e7d14b6.

Signed-off-by: Andre Kurait <akurait@amazon.com>

* Revert "Add configurable throughput and client parameters to http logs workload (#384)"

This reverts commit 4d5ae33.

Signed-off-by: Andre Kurait <akurait@amazon.com>

---------

Signed-off-by: Andre Kurait <akurait@amazon.com>
(cherry picked from commit 39de781)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 20, 2024
* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (#406)"

This reverts commit e7d14b6.

Signed-off-by: Andre Kurait <akurait@amazon.com>

* Revert "Add configurable throughput and client parameters to http logs workload (#384)"

This reverts commit 4d5ae33.

Signed-off-by: Andre Kurait <akurait@amazon.com>

---------

Signed-off-by: Andre Kurait <akurait@amazon.com>
(cherry picked from commit 39de781)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 20, 2024
* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (#406)"

This reverts commit e7d14b6.

Signed-off-by: Andre Kurait <akurait@amazon.com>

* Revert "Add configurable throughput and client parameters to http logs workload (#384)"

This reverts commit 4d5ae33.

Signed-off-by: Andre Kurait <akurait@amazon.com>

---------

Signed-off-by: Andre Kurait <akurait@amazon.com>
(cherry picked from commit 39de781)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 20, 2024
* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (#406)"

This reverts commit e7d14b6.

Signed-off-by: Andre Kurait <akurait@amazon.com>

* Revert "Add configurable throughput and client parameters to http logs workload (#384)"

This reverts commit 4d5ae33.

Signed-off-by: Andre Kurait <akurait@amazon.com>

---------

Signed-off-by: Andre Kurait <akurait@amazon.com>
(cherry picked from commit 39de781)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
IanHoang pushed a commit that referenced this pull request Sep 20, 2024
* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (#406)"

This reverts commit e7d14b6.



* Revert "Add configurable throughput and client parameters to http logs workload (#384)"

This reverts commit 4d5ae33.



---------


(cherry picked from commit 39de781)

Signed-off-by: Andre Kurait <akurait@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
IanHoang pushed a commit that referenced this pull request Sep 20, 2024
* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (#406)"

This reverts commit e7d14b6.



* Revert "Add configurable throughput and client parameters to http logs workload (#384)"

This reverts commit 4d5ae33.



---------


(cherry picked from commit 39de781)

Signed-off-by: Andre Kurait <akurait@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
IanHoang pushed a commit that referenced this pull request Sep 20, 2024
* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (#406)"

This reverts commit e7d14b6.



* Revert "Add configurable throughput and client parameters to http logs workload (#384)"

This reverts commit 4d5ae33.



---------


(cherry picked from commit 39de781)

Signed-off-by: Andre Kurait <akurait@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
IanHoang pushed a commit that referenced this pull request Sep 20, 2024
* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (#406)"

This reverts commit e7d14b6.



* Revert "Add configurable throughput and client parameters to http logs workload (#384)"

This reverts commit 4d5ae33.



---------


(cherry picked from commit 39de781)

Signed-off-by: Andre Kurait <akurait@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AndreKurait added a commit to AndreKurait/opensearch-benchmark-workloads that referenced this pull request Sep 20, 2024
…s workload (opensearch-project#384) (opensearch-project#392)"

This reverts commit 0e7c5ce

Signed-off-by: Andre Kurait <akurait@amazon.com>
AndreKurait added a commit to AndreKurait/opensearch-benchmark-workloads that referenced this pull request Sep 20, 2024
…s workload (opensearch-project#384) (opensearch-project#390)"

This reverts commit 5a78e3e

Signed-off-by: Andre Kurait <akurait@amazon.com>
AndreKurait added a commit to AndreKurait/opensearch-benchmark-workloads that referenced this pull request Sep 20, 2024
…s workload (opensearch-project#384) (opensearch-project#389)"

This reverts commit 30db148.

Signed-off-by: Andre Kurait <akurait@amazon.com>
AndreKurait added a commit to AndreKurait/opensearch-benchmark-workloads that referenced this pull request Sep 20, 2024
…s workload (opensearch-project#384) (opensearch-project#389)"

This reverts commit 30db148.

Signed-off-by: Andre Kurait <akurait@amazon.com>
AndreKurait added a commit to AndreKurait/opensearch-benchmark-workloads that referenced this pull request Sep 20, 2024
…s workload (opensearch-project#384)"

This reverts commit 4d5ae33.

Signed-off-by: Andre Kurait <akurait@amazon.com>
joshpalis pushed a commit to joshpalis/opensearch-benchmark-workloads that referenced this pull request Dec 18, 2024
…ad (opensearch-project#384)

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client parameters to http logs

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix jinja2 expressions

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* fix 200s + 400s variables

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

* add configurable throughput and client params for geonames, geopoint, geopointshape, geoshape

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>

---------

Signed-off-by: Michael Oviedo <mikeovi@amazon.com>
joshpalis pushed a commit to joshpalis/opensearch-benchmark-workloads that referenced this pull request Dec 18, 2024
…h-project#412)

* Revert "add configurable throughput and client params to nested, noaa, pmc workloads (opensearch-project#406)"

This reverts commit e7d14b6.

Signed-off-by: Andre Kurait <akurait@amazon.com>

* Revert "Add configurable throughput and client parameters to http logs workload (opensearch-project#384)"

This reverts commit 4d5ae33.

Signed-off-by: Andre Kurait <akurait@amazon.com>

---------

Signed-off-by: Andre Kurait <akurait@amazon.com>
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 backport 7 Backport to the "7" branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants