Skip to content

Commit 03920cb

Browse files
authored
Move new topology filtering logic to self_contained_coordinator.py (#289)
- reverts changes on `__runner__/args.py` - reverts changes on `__self_contained_coordinator__/runners.py`
1 parent 7ed0320 commit 03920cb

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

redis_benchmarks_specification/__runner__/args.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,6 @@ def create_client_runner_args(project_name):
214214
action="store_true",
215215
help="Run client in cluster mode.",
216216
)
217-
parser.add_argument(
218-
"--topology",
219-
default="",
220-
help="Filter tests to run only with the specified topology (e.g. oss-standalone)",
221-
)
222217
parser.add_argument(
223218
"--unix-socket",
224219
default="",

redis_benchmarks_specification/__self_contained_coordinator__/runners.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ def process_self_contained_coordinator_stream(
117117
docker_air_gap=False,
118118
verbose=False,
119119
run_tests_with_dataset=False,
120-
args=None,
121120
):
122121
stream_id = "n/a"
123122
overall_result = False
@@ -199,17 +198,6 @@ def process_self_contained_coordinator_stream(
199198
)
200199
)
201200
for topology_spec_name in benchmark_config["redis-topologies"]:
202-
# Filter by topology if specified
203-
if (
204-
args.topology
205-
and args.topology != ""
206-
and topology_spec_name != args.topology
207-
):
208-
logging.info(
209-
f"Skipping topology {topology_spec_name} as it doesn't match the requested topology {args.topology}"
210-
)
211-
continue
212-
213201
test_result = False
214202
try:
215203
current_cpu_pos = cpuset_start_pos

redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,7 @@ def process_self_contained_coordinator_stream(
494494
default_metrics_str="ALL_STATS.Totals.Ops/sec",
495495
docker_keep_env=False,
496496
restore_build_artifacts_default=True,
497+
args=None,
497498
):
498499
stream_id = "n/a"
499500
overall_result = False
@@ -780,6 +781,18 @@ def process_self_contained_coordinator_stream(
780781
for topology_spec_name in benchmark_config["redis-topologies"]:
781782
setup_name = topology_spec_name
782783
setup_type = "oss-standalone"
784+
785+
# Filter by topology if specified
786+
if (
787+
args is not None
788+
and args.topology
789+
and topology_spec_name != args.topology
790+
):
791+
logging.info(
792+
f"Skipping topology {topology_spec_name} as it doesn't match the requested topology {args.topology}"
793+
)
794+
continue
795+
783796
if topology_spec_name in topologies_map:
784797
topology_spec = topologies_map[topology_spec_name]
785798
setup_type = topology_spec["type"]

0 commit comments

Comments
 (0)