mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

nodetool: fix handling of "--primary-replica-only" argument

Browse Source 
The "--primary-replica-only" ("-pro") flag was previously ignored by
the `restore` operation. This patch ensures the argument is parsed and
applied correctly.

Closes scylladb/scylladb#28490
This commit is contained in:
Ernest Zaslavsky
2026-02-02 16:53:11 +02:00
committed by Botond Dénes
parent bce43c6b20
commit 196f7cad93
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/nodetool/test_restore.py
View File

@@ -87,3 +87,17 @@ end: {end_time}
"""
assert res.returncode == expected_returncode
assert res.stdout == expected_output
@pytest.mark.parametrize("scope_val", ["all", "dc", "rack"])
@pytest.mark.parametrize("pro_val", ["--primary-replica-only", "-pro"])
def test_restore_scope_primary_replica(nodetool, scylla_only, scope_val, pro_val):
nodetool("restore", "--endpoint", "s3.us-east-2.amazonaws.com", "--bucket", "test_bucket", "--prefix",
"test_prefix", "--keyspace", "ks", "--table", "tbl", f"--scope={scope_val}", pro_val,
"me-1-big-TOC.txt",
expected_requests=[
expected_request("POST", "/storage_service/restore",
params={"endpoint": "s3.us-east-2.amazonaws.com", "bucket": "test_bucket",
"table": "tbl", "prefix": "test_prefix", "keyspace": "ks",
"scope": f"{scope_val}", "primary_replica_only": "true"}, body=["me-1-big-TOC.txt"])],
check_return_code=False)

3
tools/scylla-nodetool.cc
View File

@@ -1890,6 +1890,9 @@ void restore_operation(scylla_rest_client& client, const bpo::variables_map& vm)
if (not sstables_as_params and not sstables_as_file_list) {
throw std::invalid_argument("missing both argument: sstables and --sstables-file-list (at least one is required)");
}
if (vm.contains("primary-replica-only")) {
params["primary_replica_only"] = "true";
}
if (vm.contains("scope")) {
if (vm.contains("primary-replica-only") && vm["scope"].as<sstring>() == "node") {
throw std::invalid_argument("Cannot set both primary_replica_only and scope=node");