From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 942081FF13C for ; Thu, 16 Apr 2026 19:19:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 75826DCB4; Thu, 16 Apr 2026 19:19:21 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v7 6/9] api: add POST endpoint for move-namespace Date: Thu, 16 Apr 2026 19:18:27 +0200 Message-ID: <20260416171830.266553-7-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: 1776359847861 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: ALV2A7K3GJCYRKGLJ2OZGWGUPES2TUVZ X-Message-ID-Hash: ALV2A7K3GJCYRKGLJ2OZGWGUPES2TUVZ 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 a dedicated /move-namespace endpoint for moving namespaces to a new location within the same datastore. Exposes max-depth, delete-source, and merge-groups as optional parameters. Signed-off-by: Hannes Laimer --- src/api2/admin/datastore.rs | 4 ++ src/api2/admin/namespace.rs | 99 ++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 54895f2b..a91d48dc 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -2957,6 +2957,10 @@ const DATASTORE_INFO_SUBDIRS: SubdirMap = &[ ), ("mount", &Router::new().post(&API_METHOD_MOUNT)), ("move-group", &Router::new().post(&API_METHOD_MOVE_GROUP)), + ( + "move-namespace", + &Router::new().post(&crate::api2::admin::namespace::API_METHOD_MOVE_NAMESPACE), + ), ( "namespace", // FIXME: move into datastore:: sub-module?! diff --git a/src/api2/admin/namespace.rs b/src/api2/admin/namespace.rs index c885ab54..abfaf8ff 100644 --- a/src/api2/admin/namespace.rs +++ b/src/api2/admin/namespace.rs @@ -1,12 +1,16 @@ use anyhow::{bail, Error}; use pbs_config::CachedUserInfo; -use proxmox_router::{http_bail, ApiMethod, Permission, Router, RpcEnvironment}; +use proxmox_rest_server::WorkerTask; +use proxmox_router::{ + http_bail, ApiMethod, Permission, Router, RpcEnvironment, RpcEnvironmentType, +}; use proxmox_schema::*; +use serde_json::{json, Value}; use pbs_api_types::{ Authid, BackupGroupDeleteStats, BackupNamespace, NamespaceListItem, Operation, - DATASTORE_SCHEMA, NS_MAX_DEPTH_SCHEMA, PROXMOX_SAFE_ID_FORMAT, + DATASTORE_SCHEMA, NS_MAX_DEPTH_SCHEMA, PROXMOX_SAFE_ID_FORMAT, UPID_SCHEMA, }; use pbs_datastore::DataStore; @@ -192,6 +196,97 @@ pub fn delete_namespace( Ok(stats) } +#[api( + 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.", + }, + }, + }, + returns: { + schema: UPID_SCHEMA, + }, + access: { + permission: &Permission::Anybody, + description: "Requires DATASTORE_MODIFY on the parent of 'ns' and on the parent of 'target-ns'.", + }, +)] +/// Move a backup namespace (including all child namespaces and groups) to a new location. +pub fn move_namespace( + store: String, + ns: BackupNamespace, + target_ns: BackupNamespace, + max_depth: Option, + delete_source: bool, + merge_groups: bool, + rpcenv: &mut dyn RpcEnvironment, +) -> Result { + let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; + + check_ns_modification_privs(&store, &ns, &auth_id)?; + check_ns_modification_privs(&store, &target_ns, &auth_id)?; + + let datastore = + DataStore::lookup_datastore(crate::tools::lookup_with(&store, Operation::Write))?; + + // Best-effort pre-checks for a fast synchronous error before spawning a worker. + if ns.is_root() { + bail!("cannot move root namespace"); + } + if ns == target_ns { + bail!("source and target namespace must be different"); + } + if !datastore.namespace_exists(&ns) { + bail!("source namespace '{ns}' does not exist"); + } + let target_parent = target_ns.parent(); + if !target_ns.is_root() && !datastore.namespace_exists(&target_parent) { + bail!("target parent namespace '{target_parent}' does not exist"); + } + if ns.contains(&target_ns).is_some() { + bail!("cannot move namespace '{ns}' into its own subtree (target: '{target_ns}')"); + } + + let worker_id = format!("{store}:{ns}:{target_ns}"); + let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; + + let upid_str = WorkerTask::new_thread( + "move-namespace", + Some(worker_id), + auth_id.to_string(), + to_stdout, + move |_worker| { + datastore.move_namespace(&ns, &target_ns, max_depth, delete_source, merge_groups) + }, + )?; + + Ok(json!(upid_str)) +} + pub const ROUTER: Router = Router::new() .get(&API_METHOD_LIST_NAMESPACES) .post(&API_METHOD_CREATE_NAMESPACE) -- 2.47.3