Skip to content

Commit d37736f

Browse files
Revamp description and dataset uniqueness
1 parent f0cb2fc commit d37736f

File tree

172 files changed

+1004
-359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+1004
-359
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 = "redis-benchmarks-specification"
3-
version = "0.1.291"
3+
version = "0.1.298"
44
description = "The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute."
55
authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
66
readme = "Readme.md"

redis_benchmarks_specification/__common__/runner.py

Lines changed: 64 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ def exporter_datasink_common(
153153
topology_spec_name,
154154
default_metrics=None,
155155
git_hash=None,
156+
collect_commandstats=True,
157+
collect_memory_metrics=True,
156158
):
157159
logging.info(
158160
f"Using datapoint_time_ms: {datapoint_time_ms}. git_hash={git_hash}, git_branch={git_branch}, git_version={git_version}. gh_org={tf_github_org}, gh_repo={tf_github_repo}"
@@ -181,71 +183,77 @@ def exporter_datasink_common(
181183
None,
182184
git_hash,
183185
)
184-
logging.info("Collecting memory metrics")
185-
(
186-
_,
187-
_,
188-
overall_end_time_metrics,
189-
) = collect_redis_metrics(
190-
redis_conns,
191-
["memory"],
192-
{
193-
"memory": [
194-
"used_memory",
195-
"used_memory_dataset",
196-
]
197-
},
198-
)
199-
print(overall_end_time_metrics)
200-
# 7 days from now
201-
expire_redis_metrics_ms = 7 * 24 * 60 * 60 * 1000
202-
export_redis_metrics(
203-
git_version,
204-
datapoint_time_ms,
205-
overall_end_time_metrics,
206-
datasink_conn,
207-
setup_name,
208-
setup_type,
209-
test_name,
210-
git_branch,
211-
tf_github_org,
212-
tf_github_repo,
213-
tf_triggering_env,
214-
{"metric-type": "redis-metrics"},
215-
expire_redis_metrics_ms,
216-
)
217-
logging.info("Collecting commandstat metrics")
218-
(
219-
_,
220-
_,
221-
overall_commandstats_metrics,
222-
) = collect_redis_metrics(redis_conns, ["commandstats"])
223-
export_redis_metrics(
224-
git_version,
225-
datapoint_time_ms,
226-
overall_commandstats_metrics,
227-
datasink_conn,
228-
setup_name,
229-
setup_type,
230-
test_name,
231-
git_branch,
232-
tf_github_org,
233-
tf_github_repo,
234-
tf_triggering_env,
235-
{"metric-type": "commandstats"},
236-
expire_redis_metrics_ms,
237-
)
186+
if collect_memory_metrics:
187+
logging.info("Collecting memory metrics")
188+
(
189+
_,
190+
_,
191+
overall_end_time_metrics,
192+
) = collect_redis_metrics(
193+
redis_conns,
194+
["memory"],
195+
{
196+
"memory": [
197+
"used_memory",
198+
"used_memory_dataset",
199+
]
200+
},
201+
)
202+
print(overall_end_time_metrics)
203+
# 7 days from now
204+
expire_redis_metrics_ms = 7 * 24 * 60 * 60 * 1000
205+
export_redis_metrics(
206+
git_version,
207+
datapoint_time_ms,
208+
overall_end_time_metrics,
209+
datasink_conn,
210+
setup_name,
211+
setup_type,
212+
test_name,
213+
git_branch,
214+
tf_github_org,
215+
tf_github_repo,
216+
tf_triggering_env,
217+
{"metric-type": "redis-memory-metrics"},
218+
expire_redis_metrics_ms,
219+
git_hash,
220+
running_platform,
221+
)
222+
if collect_commandstats:
223+
logging.info("Collecting commandstat metrics")
224+
(
225+
_,
226+
_,
227+
overall_commandstats_metrics,
228+
) = collect_redis_metrics(redis_conns, ["commandstats"])
229+
export_redis_metrics(
230+
git_version,
231+
datapoint_time_ms,
232+
overall_commandstats_metrics,
233+
datasink_conn,
234+
setup_name,
235+
setup_type,
236+
test_name,
237+
git_branch,
238+
tf_github_org,
239+
tf_github_repo,
240+
tf_triggering_env,
241+
{"metric-type": "commandstats"},
242+
expire_redis_metrics_ms,
243+
git_hash,
244+
running_platform,
245+
)
238246

239247
# Update deployment tracking sets
240248
deployment_type_and_name = f"{setup_type}_AND_{setup_name}"
241249
deployment_type_and_name_and_version = f"{setup_type}_AND_{setup_name}_AND_{git_version}"
242250

243251
# Add to deployment-specific set
244-
deployment_set_key = f"ci.benchmarks.redislabs/{tf_triggering_env}/{deployment_type_and_name_and_version}:set"
252+
deployment_set_key = f"ci.benchmarks.redis/{tf_triggering_env}/{deployment_type_and_name_and_version}:set"
245253
datasink_conn.sadd(deployment_set_key, test_name)
246254

247255
# Add to testcases set
248-
testcases_set_key = f"ci.benchmarks.redislabs/{tf_triggering_env}/testcases:set"
256+
testcases_set_key = f"ci.benchmarks.redis/{tf_triggering_env}/testcases:set"
249257
datasink_conn.sadd(testcases_set_key, test_name)
250258

251259
# Add metadata fields to timeseries metadata

redis_benchmarks_specification/__common__/timeseries.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,6 @@ def timeseries_test_sucess_flow(
11731173
testcase_metric_context_paths = []
11741174
version_target_tables = None
11751175
branch_target_tables = None
1176-
11771176
if timeseries_dict is None:
11781177
(
11791178
timeseries_dict,

0 commit comments

Comments
 (0)