Skip to content

Move topology filtering logic #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2025
Merged

Move topology filtering logic #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions redis_benchmarks_specification/__runner__/args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,6 @@ def create_client_runner_args(project_name):
action="store_true",
help="Run client in cluster mode.",
)
parser.add_argument(
"--topology",
default="",
help="Filter tests to run only with the specified topology (e.g. oss-standalone)",
)
parser.add_argument(
"--unix-socket",
default="",
Expand Down
12 changes: 0 additions & 12 deletions redis_benchmarks_specification/__self_contained_coordinator__/runners.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ def process_self_contained_coordinator_stream(
docker_air_gap=False,
verbose=False,
run_tests_with_dataset=False,
args=None,
):
stream_id = "n/a"
overall_result = False
Expand Down Expand Up @@ -199,17 +198,6 @@ def process_self_contained_coordinator_stream(
)
)
for topology_spec_name in benchmark_config["redis-topologies"]:
# Filter by topology if specified
if (
args.topology
and args.topology != ""
and topology_spec_name != args.topology
):
logging.info(
f"Skipping topology {topology_spec_name} as it doesn't match the requested topology {args.topology}"
)
continue

test_result = False
try:
current_cpu_pos = cpuset_start_pos
Expand Down
13 changes: 13 additions & 0 deletions redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,7 @@ def process_self_contained_coordinator_stream(
default_metrics_str="ALL_STATS.Totals.Ops/sec",
docker_keep_env=False,
restore_build_artifacts_default=True,
args=None,
):
stream_id = "n/a"
overall_result = False
Expand Down Expand Up @@ -780,6 +781,18 @@ def process_self_contained_coordinator_stream(
for topology_spec_name in benchmark_config["redis-topologies"]:
setup_name = topology_spec_name
setup_type = "oss-standalone"

# Filter by topology if specified
if (
args is not None
and args.topology
and topology_spec_name != args.topology
):
logging.info(
f"Skipping topology {topology_spec_name} as it doesn't match the requested topology {args.topology}"
)
continue

if topology_spec_name in topologies_map:
topology_spec = topologies_map[topology_spec_name]
setup_type = topology_spec["type"]
Expand Down