Skip to content

Commit 69681e5

Browse files
Updated redis-py to >4.3 (#358)
* 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()
1 parent 361e36d commit 69681e5

File tree

7 files changed

+1648
-13
lines changed

7 files changed

+1648
-13
lines changed

poetry.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redisbench-admin"
3-
version = "0.9.2"
3+
version = "0.9.3"
44
description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
55
authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
66
readme = "README.md"
@@ -41,7 +41,7 @@ psutil = "^5.6.6"
4141
scipy = "^1.3.3"
4242
Jinja2 = "^3.0.3"
4343
watchdog = "^2.1.6"
44-
redis = "4.2.2"
44+
redis = "^4.2.2"
4545
slack-sdk = "^3.15.2"
4646
slack-bolt = "^1.13.0"
4747
certifi = "^2021.10.8"

redisbench_admin/environments/oss_cluster.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def generate_cluster_redis_server_args(
175175
"--cluster-config-file",
176176
"cluster-node-port-{}.config".format(port),
177177
"--save",
178-
"''",
178+
"",
179179
"--cluster-announce-ip",
180180
"{}".format(ip),
181181
"--port",

redisbench_admin/run/grafana.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def generate_artifacts_table_grafana_redis(
6363
)
6464
profile_markdown_str = htmlwriter.dumps()
6565
profile_markdown_str = profile_markdown_str.replace("\n", "")
66-
profile_id = "{}_{}_hash_{}".format(start_time_str, setup_name, tf_github_sha)
66+
profile_id = get_profile_id_keyname(setup_name, start_time_str, tf_github_sha)
6767
profile_string_testcase_markdown_key = "profile:{}:{}".format(profile_id, test_name)
6868
(
6969
profile_set_redis_key,
@@ -132,7 +132,7 @@ def generate_artifacts_table_grafana_redis(
132132
zset_profiles_setups_testcases_profileid,
133133
{profile_id: start_time_ms},
134134
)
135-
redis_conn.zadd(
135+
res = redis_conn.zadd(
136136
zset_profiles,
137137
{profile_id: start_time_ms},
138138
)
@@ -160,6 +160,11 @@ def generate_artifacts_table_grafana_redis(
160160
return https_link
161161

162162

163+
def get_profile_id_keyname(setup_name, start_time_str, tf_github_sha):
164+
profile_id = "{}_{}_hash_{}".format(start_time_str, setup_name, tf_github_sha)
165+
return profile_id
166+
167+
163168
def get_profile_zset_names(
164169
profile_id, setup_name, test_name, tf_github_branch, tf_github_org, tf_github_repo
165170
):

0 commit comments

Comments
 (0)