Skip to content

Commit

Permalink
Updated redis-py to >4.3 (#358)
Browse files Browse the repository at this point in the history
* Updated redis-py to >4.3

* Fixed spin_up_local_redis_cluster() on redis>=7

* Adding missing pyperf results json

* Fixed test_fill_avg_stddev_pyperf()

* Fixed test_generate_artifacts_table_grafana_redis()

* Reverted logging to proper level on generate_artifacts_table_grafana_redis()
  • Loading branch information
filipecosta90 authored May 16, 2022
1 parent 361e36d commit 69681e5
Show file tree
Hide file tree
Showing 7 changed files with 1,648 additions and 13 deletions.
10 changes: 5 additions & 5 deletions poetry.lock

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
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
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
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

0 comments on commit 69681e5

Please sign in to comment.