Skip to content

I am using the option name as the variable name everywhere to avoid m… #51

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
epugh merged 1 commit into from
Jun 21, 2026
Merged

I am using the option name as the variable name everywhere to avoid m… #51

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
10 changes: 1 addition & 9 deletions solrorbit/benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,14 +701,6 @@ def add_workload_source(subparser):
default=False,
help="If any processes is running, it is going to kill them and allow solr-orbit to continue to run."
)
test_run_parser.add_argument(
"--allow-unsupported-user-managed",
action="store_true",
default=False,
help="Skip the SolrCloud mode requirement check and run against a user-managed "
"(non-cloud) target anyway (default: false). Use at your own risk; many operations only "
"work in SolrCloud mode."
)
test_run_parser.add_argument(
"--latency-percentiles",
help=f"A comma-separated list of percentiles to report for latency "
Expand Down Expand Up @@ -1163,7 +1155,7 @@ def configure_test(arg_parser, args, cfg):
"worker_coordinator",
"worker_ips",
opts.csv_to_list(args.worker_ips))
cfg.add(config.Scope.applicationOverride, "solr", "allow.user.managed", args.allow_user_managed)
cfg.add(config.Scope.applicationOverride, "solr", "allow.unsupported.user.managed", args.allow_unsupported_user_managed)
cfg.add(config.Scope.applicationOverride, "workload", "test.mode.enabled", args.test_mode)
cfg.add(config.Scope.applicationOverride, "workload", "load.test.clients", int(args.load_test_qps))
if args.redline_test:
Expand Down
2 changes: 1 addition & 1 deletion solrorbit/test_run_orchestrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ def _check_cloud_mode(cfg):
"""Fail fast with a clear error if the target Solr cluster is not in SolrCloud mode."""
from solrorbit.client import SolrAdminClient, SolrClientError # local import to avoid circular

if cfg.opts("solr", "allow.user.managed", mandatory=False, default_value=False):
if cfg.opts("solr", "allow.unsupported.user.managed", mandatory=False, default_value=False):
logging.getLogger(__name__).warning(
"Skipping SolrCloud-mode requirement check (--allow-unsupported-user-managed). "
"Some operations may fail if the target is not in SolrCloud mode."
Expand Down
6 changes: 3 additions & 3 deletions tests/test_execution_orchestrator_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@ def test_runs_a_default_pipeline(benchmark_only_pipeline):
benchmark_only_pipeline.target.assert_called_once_with(cfg)


def test_check_cloud_mode_skipped_when_allow_user_managed():
def test_check_cloud_mode_skipped_when_allow_unsupported_user_managed():
# --allow-unsupported-user-managed must bypass the check entirely, without touching the network
cfg = config.Config()
cfg.add(config.Scope.benchmark, "client", "hosts", ["localhost:8983"])
cfg.add(config.Scope.benchmark, "solr", "allow.user.managed", True)
cfg.add(config.Scope.benchmark, "solr", "allow.unsupported.user.managed", True)

with mock.patch("solrorbit.client.SolrAdminClient") as admin_client:
test_run_orchestrator._check_cloud_mode(cfg)
Expand All @@ -145,7 +145,7 @@ def test_check_cloud_mode_skipped_when_allow_user_managed():
def test_check_cloud_mode_raises_for_standalone_solr():
cfg = config.Config()
cfg.add(config.Scope.benchmark, "client", "hosts", opts.TargetHosts("localhost:8983"))
cfg.add(config.Scope.benchmark, "solr", "allow.user.managed", False)
cfg.add(config.Scope.benchmark, "solr", "allow.unsupported.user.managed", False)

with mock.patch("solrorbit.client.SolrAdminClient") as admin_client:
admin_client.return_value.is_cloud_mode.return_value = False
Expand Down