Skip to content

Commit 83c996e

Browse files
[add] Allowed to specify triggering env and env name on compare (#250)
1 parent b8eee46 commit 83c996e

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redisbench-admin"
3-
version = "0.5.23"
3+
version = "0.5.24"
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/args.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,14 @@ def create_compare_arguments(parser):
3939
parser.add_argument("--github_org", type=str, default=GITHUB_ORG)
4040
parser.add_argument("--triggering_env", type=str, default=TRIGGERING_ENV)
4141
parser.add_argument("--deployment_type", type=str, default="oss-standalone")
42+
parser.add_argument("--deployment_name", type=str, default="oss-standalone")
4243
parser.add_argument("--metric_name", type=str, default="Tests.Overall.rps")
43-
parser.add_argument("--metric_mode", type=str, default="higher-better")
44+
parser.add_argument(
45+
"--metric_mode",
46+
type=str,
47+
default="higher-better",
48+
help="either 'lower-better' or 'higher-better'",
49+
)
4450
parser.add_argument("--baseline-branch", type=str, default=None, required=False)
4551
parser.add_argument("--baseline-tag", type=str, default=None, required=False)
4652
parser.add_argument("--comparison-branch", type=str, default=None, required=False)

redisbench_admin/compare/compare.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ def compare_command_logic(args, project_name, project_version):
3939
tf_github_repo = args.github_repo
4040
tf_triggering_env = args.triggering_env
4141
deployment_type = args.deployment_type
42+
deployment_name = args.deployment_name
43+
logging.info(
44+
"Using deployment_type={} and deployment_name={} for the analysis".format(
45+
deployment_type,
46+
deployment_name,
47+
)
48+
)
4249
from_ts_ms = args.from_timestamp
4350
to_ts_ms = args.to_timestamp
4451
use_tag = False
@@ -116,7 +123,6 @@ def compare_command_logic(args, project_name, project_version):
116123
for test_name in test_names:
117124

118125
test_name = test_name.decode()
119-
deployment_name = deployment_type
120126
ts_name_baseline = get_ts_metric_name(
121127
"by.{}".format(by_str),
122128
baseline_str,
@@ -157,7 +163,11 @@ def compare_command_logic(args, project_name, project_version):
157163
pass
158164
percentage_change = "N/A"
159165
percentage_change = 0.0
166+
baseline_v_str = "N/A"
167+
comparison_v_str = "N/A"
160168
if baseline_v != "N/A" and comparison_v != "N/A":
169+
baseline_v_str = "{:.3f}".format(baseline_v)
170+
comparison_v_str = "{:.3f}".format(comparison_v)
161171
if metric_mode == "higher-better":
162172
percentage_change = (
163173
float(comparison_v) / float(baseline_v) - 1
@@ -192,8 +202,8 @@ def compare_command_logic(args, project_name, project_version):
192202
profilers_artifacts_matrix.append(
193203
[
194204
test_name,
195-
baseline_v,
196-
comparison_v,
205+
baseline_v_str,
206+
comparison_v_str,
197207
percentage_change_str,
198208
]
199209
)

0 commit comments

Comments
 (0)