Skip to content

Commit 61f15a0

Browse files
Added deployment_name zsets (#328)
1 parent f35487a commit 61f15a0

File tree

8 files changed

+20
-1
lines changed

8 files changed

+20
-1
lines changed

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redisbench-admin"
3-
version = "0.7.22"
3+
version = "0.7.23"
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"

redisbench_admin/compare/compare.py

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ def compare_command_logic(args, project_name, project_version):
9393
(
9494
prefix,
9595
testcases_setname,
96+
_,
9697
tsname_project_total_failures,
9798
tsname_project_total_success,
9899
_,

redisbench_admin/run/redistimeseries.py

+9
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ def update_secondary_result_keys(
358358
(
359359
_,
360360
testcases_setname,
361+
deployment_name_zsetname,
361362
_,
362363
tsname_project_total_success,
363364
running_platforms_setname,
@@ -378,7 +379,15 @@ def update_secondary_result_keys(
378379
test_name,
379380
)
380381
try:
382+
rts.zadd(deployment_name_zsetname, {deployment_name: start_time_ms})
381383
if test_name is not None:
384+
deployment_name_zsetname_testnames = (
385+
deployment_name_zsetname
386+
+ "{}:deployment_name={}".format(
387+
deployment_name_zsetname, deployment_name
388+
)
389+
)
390+
rts.zadd(deployment_name_zsetname_testnames, {test_name: start_time_ms})
382391
rts.sadd(testcases_setname, test_name)
383392
testcases_zsetname = testcases_setname + ":zset"
384393
rts.zadd(testcases_zsetname, {test_name: start_time_ms})

redisbench_admin/run_remote/run_remote.py

+1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ def run_remote_command_logic(args, project_name, project_version):
155155
remote_envs = {}
156156
dirname = "."
157157
(
158+
_,
158159
_,
159160
_,
160161
tsname_project_total_failures,

redisbench_admin/utils/remote.py

+2
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,7 @@ def get_overall_dashboard_keynames(
988988
)
989989
)
990990
testcases_setname = "{}:testcases".format(sprefix)
991+
deployment_name_setname = "{}:deployment_names".format(sprefix)
991992
project_archs_setname = "{}:archs".format(sprefix)
992993
project_oss_setname = "{}:oss".format(sprefix)
993994
project_branches_setname = "{}:branches".format(sprefix)
@@ -1024,6 +1025,7 @@ def get_overall_dashboard_keynames(
10241025
return (
10251026
prefix,
10261027
testcases_setname,
1028+
deployment_name_setname,
10271029
tsname_project_total_failures,
10281030
tsname_project_total_success,
10291031
running_platforms_setname,

tests/test_aa_run_remote.py

+2
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ def test_get_overall_dashboard_keynames():
9696
(
9797
prefix,
9898
testcases_setname,
99+
deployment_name_setname,
99100
tsname_project_total_failures,
100101
tsname_project_total_success,
101102
_,
@@ -121,6 +122,7 @@ def test_get_overall_dashboard_keynames():
121122
(
122123
prefix,
123124
testcases_setname,
125+
deployment_name_setname,
124126
tsname_project_total_failures,
125127
tsname_project_total_success,
126128
running_platforms_setname,

tests/test_redistimeseries.py

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ def test_timeseries_test_sucess_flow():
4747
(
4848
prefix,
4949
testcases_setname,
50+
deployment_name_setname,
5051
tsname_project_total_failures,
5152
tsname_project_total_success,
5253
running_platforms_setname,
@@ -100,6 +101,7 @@ def test_timeseries_test_sucess_flow():
100101

101102
assert rts.exists(testcases_and_metric_context_path_setname)
102103
assert rts.exists(testcases_metric_context_path_setname)
104+
assert rts.exists(deployment_name_setname)
103105
testcases_zsetname = testcases_setname + ":zset"
104106
testcases_zsetname_component_search = (
105107
testcases_setname + ":zset:component:search"
@@ -109,6 +111,7 @@ def test_timeseries_test_sucess_flow():
109111
assert rts.zcard(testcases_zsetname)
110112
assert rts.zcard(testcases_zsetname_component_search)
111113
assert test_name.encode() in rts.zpopmin(testcases_zsetname)[0][0]
114+
assert deployment_name.encode() in rts.zpopmin(deployment_name_setname)[0][0]
112115
assert rts.exists(testcases_zsetname_component_search)
113116
assert (
114117
test_name.encode()

tests/test_remote.py

+1
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ def test_exporter_create_ts():
277277
(
278278
prefix,
279279
testcases_setname,
280+
deployment_name_setname,
280281
tsname_project_total_failures,
281282
tsname_project_total_success,
282283
running_platforms_setname,

0 commit comments

Comments
 (0)