From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id AE2771FF13C for ; Thu, 16 Apr 2026 19:19:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8CFE1DD21; Thu, 16 Apr 2026 19:19:26 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v7 9/9] cli: add move-namespace and move-group commands Date: Thu, 16 Apr 2026 19:18:30 +0200 Message-ID: <20260416171830.266553-10-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260416171830.266553-1-h.laimer@proxmox.com> References: <20260416171830.266553-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776359854160 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.083 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: LENIG7RF7CZQ2QDWXBRVQEZHNPTLB3LV X-Message-ID-Hash: LENIG7RF7CZQ2QDWXBRVQEZHNPTLB3LV X-MailFrom: h.laimer@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Add 'move-namespace' and 'move-group' subcommands to proxmox-backup-manager datastore. Both call the corresponding API handler and wait for the worker task to complete. move-namespace accepts optional --max-depth and --delete-source flags matching the API parameters. Signed-off-by: Hannes Laimer --- src/bin/proxmox_backup_manager/datastore.rs | 109 +++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/src/bin/proxmox_backup_manager/datastore.rs b/src/bin/proxmox_backup_manager/datastore.rs index 5c65c5ec..efae4cc3 100644 --- a/src/bin/proxmox_backup_manager/datastore.rs +++ b/src/bin/proxmox_backup_manager/datastore.rs @@ -1,5 +1,6 @@ use pbs_api_types::{ - DataStoreConfig, DataStoreConfigUpdater, DATASTORE_SCHEMA, PROXMOX_CONFIG_DIGEST_SCHEMA, + BackupNamespace, DataStoreConfig, DataStoreConfigUpdater, DATASTORE_SCHEMA, + NS_MAX_DEPTH_SCHEMA, PROXMOX_CONFIG_DIGEST_SCHEMA, }; use pbs_client::view_task_result; use proxmox_router::{cli::*, ApiHandler, RpcEnvironment}; @@ -323,6 +324,100 @@ async fn uuid_mount(mut param: Value, _rpcenv: &mut dyn RpcEnvironment) -> Resul Ok(Value::Null) } +#[api( + protected: true, + input: { + properties: { + store: { + schema: DATASTORE_SCHEMA, + }, + ns: { + type: BackupNamespace, + }, + "target-ns": { + type: BackupNamespace, + }, + "max-depth": { + schema: NS_MAX_DEPTH_SCHEMA, + optional: true, + }, + "delete-source": { + type: bool, + optional: true, + default: true, + description: "Remove the source namespace after moving all contents. \ + Defaults to true.", + }, + "merge-groups": { + type: bool, + optional: true, + default: true, + description: "If a group with the same name already exists in the target \ + namespace, merge snapshots into it. Requires matching ownership and \ + non-overlapping snapshot times.", + }, + }, + }, +)] +/// Move a backup namespace to a new location within the same datastore. +async fn cli_move_namespace( + mut param: Value, + rpcenv: &mut dyn RpcEnvironment, +) -> Result<(), Error> { + param["node"] = "localhost".into(); + + let info = &api2::admin::namespace::API_METHOD_MOVE_NAMESPACE; + let result = match info.handler { + ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?, + _ => unreachable!(), + }; + + crate::wait_for_local_worker(result.as_str().unwrap()).await?; + Ok(()) +} + +#[api( + protected: true, + input: { + properties: { + store: { + schema: DATASTORE_SCHEMA, + }, + ns: { + type: BackupNamespace, + }, + group: { + type: pbs_api_types::BackupGroup, + flatten: true, + }, + "target-ns": { + type: BackupNamespace, + }, + "merge-group": { + type: bool, + optional: true, + default: true, + description: "If the group already exists in the target namespace, merge \ + snapshots into it. Requires matching ownership and non-overlapping \ + snapshot times.", + }, + }, + }, +)] +/// Move a backup group to a different namespace within the same datastore. +async fn cli_move_group(mut param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> { + param["node"] = "localhost".into(); + + let info = &api2::admin::datastore::API_METHOD_MOVE_GROUP; + let result = match info.handler { + ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?, + _ => unreachable!(), + }; + + crate::wait_for_local_worker(result.as_str().unwrap()).await?; + Ok(()) +} + #[api( protected: true, input: { @@ -407,6 +502,18 @@ pub fn datastore_commands() -> CommandLineInterface { CliCommand::new(&API_METHOD_DELETE_DATASTORE) .arg_param(&["name"]) .completion_cb("name", pbs_config::datastore::complete_datastore_name), + ) + .insert( + "move-namespace", + CliCommand::new(&API_METHOD_CLI_MOVE_NAMESPACE) + .arg_param(&["store"]) + .completion_cb("store", pbs_config::datastore::complete_datastore_name), + ) + .insert( + "move-group", + CliCommand::new(&API_METHOD_CLI_MOVE_GROUP) + .arg_param(&["store"]) + .completion_cb("store", pbs_config::datastore::complete_datastore_name), ); cmd_def.into() -- 2.47.3