Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9fc6dd0
fix(tests): Use architecture-specific streams in coordinator tests
slice4e Oct 16, 2025
c7c300f
style: Format test file with black
slice4e Oct 16, 2025
2003061
style: Format runner.py with black
slice4e Oct 16, 2025
baa28ea
Merge main to get runner.py black formatting fix
slice4e Oct 16, 2025
4592b97
fix(runner): Skip validation for untested operation types
slice4e Oct 16, 2025
d00eb32
fix(tests): Add git_version to benchmark stream requests
slice4e Oct 16, 2025
fac13f6
fix(cli): Extract git_version from Docker image tag
slice4e Oct 16, 2025
805826e
style: Format cli.py with black
slice4e Oct 16, 2025
773554d
debug: Add logging to diagnose artifact_version issue
slice4e Oct 16, 2025
1e76e7b
debug: Add print statements to track artifact_version value
slice4e Oct 16, 2025
7e88020
style: Format runner.py with black
slice4e Oct 16, 2025
0fdc3a4
fix: Include running_platform in by.version key paths
slice4e Oct 16, 2025
d341d1b
fix: Add JSON module support and correct test metadata
slice4e Oct 16, 2025
a1f82e5
Merge pull request #3 from slice4e/fix_test_self_contained_coordinato…
slice4e Oct 16, 2025
5bbbe06
fix missing quote from test case memtier_benchmark-1Mkeys-string-set-…
slice4e Oct 17, 2025
683cda5
Merge pull request #4 from slice4e/fix_tests
slice4e Oct 20, 2025
df82e52
fix: Add null check before shutil.copy to prevent NoneType error
slice4e Oct 20, 2025
0748c88
Fix multi-client tests not writing aggregated results to files
slice4e Oct 20, 2025
a56d26e
Merge pull request #5 from slice4e/fix-redis-bench-test
slice4e Oct 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Include running_platform in by.version key paths
The export_redis_metrics function creates keys with the format:
{prefix}/{test}/{by_variant}/benchmark_end/{running_platform}/{setup}/{metric}

But tests were expecting keys without running_platform:
{prefix}/{test}/{by_variant}/benchmark_end/{setup}/{metric}

This fixes all 6 failing tests by adding running_platform to the expected key format.
Also removes debug print statements that helped diagnose the issue.
  • Loading branch information
slice4e committed Oct 16, 2025
commit 0fdc3a466fe9b26f308022aba2389c1c9f8fbf35
13 changes: 0 additions & 13 deletions redis_benchmarks_specification/__common__/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,12 +275,6 @@ def export_redis_metrics(
by_variants["by.branch/{}".format(tf_github_branch)] = {
"branch": tf_github_branch
}
print(
f"DEBUG export_redis_metrics: artifact_version={artifact_version!r} (type={type(artifact_version)}), git_hash={git_hash!r}, tf_github_branch={tf_github_branch!r}"
)
logging.info(
f"export_redis_metrics: artifact_version={artifact_version} (type={type(artifact_version)}), git_hash={git_hash}, tf_github_branch={tf_github_branch}"
)
if git_hash is not None and git_hash != "":
by_variants["by.hash/{}".format(git_hash)] = {"hash": git_hash}
if artifact_version is not None and artifact_version != "":
Expand All @@ -289,13 +283,6 @@ def export_redis_metrics(
by_variants["by.version/{}".format(artifact_version)] = {
"version": artifact_version
}
print(f"DEBUG: Created by.version variant for version: {artifact_version!r}")
logging.info(f"Created by.version variant for version: {artifact_version}")
else:
print(f"DEBUG: Skipping by.version - artifact_version={artifact_version!r}")
logging.warning(
f"Skipping by.version variant creation: artifact_version={artifact_version}"
)
for (
by_variant,
variant_labels_dict,
Expand Down
12 changes: 6 additions & 6 deletions utils/tests/test_self_contained_coordinator_memtier.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ def test_self_contained_coordinator_dockerhub_preload():
assert result == True
assert number_processed_streams == 1
assert num_process_test_suites == 1
by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-generic-touch-pipeline-10/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-generic-touch-pipeline-10/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone/memory_maxmemory"
assert datasink_conn.exists(by_version_key)
rts = datasink_conn.ts()
# check we have by version metrics
Expand Down Expand Up @@ -465,7 +465,7 @@ def test_self_contained_coordinator_dockerhub():
assert result == True
assert number_processed_streams == 1
assert num_process_test_suites == 1
by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone/memory_maxmemory"
assert datasink_conn.exists(by_version_key)
rts = datasink_conn.ts()
# check we have by version metrics
Expand Down Expand Up @@ -596,7 +596,7 @@ def test_self_contained_coordinator_dockerhub_iothreads():
assert result == True
assert number_processed_streams == 1
assert num_process_test_suites == 1
by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone-02-io-threads/memory_maxmemory"
by_version_key = f"ci.benchmarks.redis/ci/redis/redis/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone-02-io-threads/memory_maxmemory"
assert datasink_conn.exists(by_version_key)
rts = datasink_conn.ts()
# check we have by version metrics
Expand Down Expand Up @@ -735,7 +735,7 @@ def test_self_contained_coordinator_dockerhub_valkey():
assert result == True
assert number_processed_streams == 1
assert num_process_test_suites == 1
by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone/memory_maxmemory"
assert datasink_conn.exists(by_version_key)
rts = datasink_conn.ts()
# check we have by version metrics
Expand Down Expand Up @@ -873,7 +873,7 @@ def test_dockerhub_via_cli():
assert result == True
assert number_processed_streams == 1
assert num_process_test_suites == 1
by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone/memory_maxmemory"
assert datasink_conn.exists(by_version_key)
rts = datasink_conn.ts()
# check we have by version metrics
Expand Down Expand Up @@ -1007,7 +1007,7 @@ def test_dockerhub_via_cli_airgap():
assert result == True
assert number_processed_streams == 1
assert num_process_test_suites == 1
by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/oss-standalone/memory_maxmemory"
by_version_key = f"ci.benchmarks.redis/ci/{github_org}/{github_repo}/memtier_benchmark-1Mkeys-load-string-with-10B-values/by.version/{redis_version}/benchmark_end/{running_platform}/oss-standalone/memory_maxmemory"
assert datasink_conn.exists(by_version_key)
rts = datasink_conn.ts()
# check we have by version metrics
Expand Down