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.

Sign up for GitHub

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

Updated redis-py to >4.3 #358

Merged
merged 6 commits into from
May 16, 2022
Merged

Updated redis-py to >4.3 #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f19fe90
Updated redis-py to >4.3
filipecosta90 May 16, 2022
9221a75
Fixed spin_up_local_redis_cluster() on redis>=7
filipecosta90 May 16, 2022
fbe51da
Adding missing pyperf results json
filipecosta90 May 16, 2022
2f0633f
Fixed test_fill_avg_stddev_pyperf()
filipecosta90 May 16, 2022
e850a0d
Fixed test_generate_artifacts_table_grafana_redis()
filipecosta90 May 16, 2022
e168f4f
Reverted logging to proper level on generate_artifacts_table_grafana_…
filipecosta90 May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "redisbench-admin"
version = "0.9.2"
version = "0.9.3"
description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
readme = "README.md"
Expand Down Expand Up @@ -41,7 +41,7 @@ psutil = "^5.6.6"
scipy = "^1.3.3"
Jinja2 = "^3.0.3"
watchdog = "^2.1.6"
redis = "4.2.2"
redis = "^4.2.2"
slack-sdk = "^3.15.2"
slack-bolt = "^1.13.0"
certifi = "^2021.10.8"
Expand Down
2 changes: 1 addition & 1 deletion redisbench_admin/environments/oss_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def generate_cluster_redis_server_args(
"--cluster-config-file",
"cluster-node-port-{}.config".format(port),
"--save",
"''",
"",
"--cluster-announce-ip",
"{}".format(ip),
"--port",
Expand Down
9 changes: 7 additions & 2 deletions redisbench_admin/run/grafana.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def generate_artifacts_table_grafana_redis(
)
profile_markdown_str = htmlwriter.dumps()
profile_markdown_str = profile_markdown_str.replace("\n", "")
profile_id = "{}_{}_hash_{}".format(start_time_str, setup_name, tf_github_sha)
profile_id = get_profile_id_keyname(setup_name, start_time_str, tf_github_sha)
profile_string_testcase_markdown_key = "profile:{}:{}".format(profile_id, test_name)
(
profile_set_redis_key,
Expand Down Expand Up @@ -132,7 +132,7 @@ def generate_artifacts_table_grafana_redis(
zset_profiles_setups_testcases_profileid,
{profile_id: start_time_ms},
)
redis_conn.zadd(
res = redis_conn.zadd(
zset_profiles,
{profile_id: start_time_ms},
)
Expand Down Expand Up @@ -160,6 +160,11 @@ def generate_artifacts_table_grafana_redis(
return https_link


def get_profile_id_keyname(setup_name, start_time_str, tf_github_sha):
profile_id = "{}_{}_hash_{}".format(start_time_str, setup_name, tf_github_sha)
return profile_id


def get_profile_zset_names(
profile_id, setup_name, test_name, tf_github_branch, tf_github_org, tf_github_repo
):
Expand Down
Loading