From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 07/15] api2: add (un)mount endpoint for removable ds's
Date: Thu, 19 Aug 2021 13:03:35 +0200 [thread overview]
Message-ID: <20210819110343.8708-8-h.laimer@proxmox.com> (raw)
In-Reply-To: <20210819110343.8708-1-h.laimer@proxmox.com>
Add endpoints for mounting and unmounting removable datastores by their
name.
---
src/api2/admin/datastore.rs | 144 ++++++++++++++++++++++++++++++++++++
1 file changed, 144 insertions(+)
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index b236dfab..f6adc663 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -39,6 +39,7 @@ use crate::config::datastore;
use crate::config::cached_user_info::CachedUserInfo;
use crate::server::{jobstate::Job, WorkerTask};
+use crate::tools::disks::{mount_by_uuid, unmount_by_mount_point};
use crate::config::acl::{
PRIV_DATASTORE_AUDIT,
@@ -1859,6 +1860,139 @@ pub fn set_backup_owner(
Ok(())
}
+pub fn do_mount(store: String, auth_id: &Authid) -> Result<String, Error> {
+ let (config, _digest) = datastore::config()?;
+ let store_config = config.lookup("datastore", &store)?;
+
+ let upid_str = WorkerTask::new_thread(
+ "mount",
+ Some(store.clone()),
+ auth_id.clone(),
+ false,
+ move |_worker| {
+ if check_if_available(&store_config).is_ok() {
+ bail!(
+ "Datastore '{}' can't be mounted because it is already available.",
+ &store_config.name
+ );
+ };
+ if let (Some(uuid), Some(mount_point)) = (
+ store_config.backing_device,
+ store_config.backing_device_mount_point,
+ ) {
+ let mount_point_path = std::path::Path::new(&mount_point);
+ mount_by_uuid(&uuid, &mount_point_path)
+ } else {
+ bail!(
+ "Datastore '{}' can't be mounted because it is not removable.",
+ &store_config.name
+ );
+ }
+ },
+ )?;
+
+ Ok(upid_str)
+}
+
+#[api(
+ protected: true,
+ input: {
+ properties: {
+ store: {
+ schema: DATASTORE_SCHEMA,
+ },
+ }
+ },
+ returns: {
+ schema: UPID_SCHEMA,
+ },
+ access: {
+ permission: &Permission::Privilege(&["datastore", "{store}"], PRIV_DATASTORE_AUDIT, false),
+ },
+)]
+/// Mount removable datastore.
+pub fn mount(store: String, mut rpcenv: &mut dyn RpcEnvironment) -> Result<Value, Error> {
+ let (_config, digest) = datastore::config()?;
+
+ rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into();
+
+ let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
+
+ do_mount(store, &auth_id).map(|upid_str| json!(upid_str))
+}
+
+#[api(
+ protected: true,
+ input: {
+ properties: {
+ store: {
+ schema: DATASTORE_SCHEMA,
+ },
+ },
+ },
+ returns: {
+ schema: UPID_SCHEMA,
+ },
+ access: {
+ permission: &Permission::Privilege(&["datastore", "{store}"], PRIV_DATASTORE_AUDIT, false),
+ },
+)]
+/// Unmount removable datastore.
+pub fn unmount(store: String, mut rpcenv: &mut dyn RpcEnvironment) -> Result<Value, Error> {
+ let (config, digest) = datastore::config()?;
+
+ let store_config = config.lookup("datastore", &store)?;
+ rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into();
+
+ let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
+ let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
+
+ let upid_str = WorkerTask::new_thread(
+ "unmount",
+ Some(store.clone()),
+ auth_id.clone(),
+ to_stdout,
+ move |_worker| {
+ if !check_if_available(&store_config).is_ok() {
+ bail!(
+ "Datastore '{}' can't be unmounted because it is not available.",
+ &store_config.name
+ );
+ };
+ if let (Some(_uuid), Some(mount_point)) = (
+ store_config.backing_device,
+ store_config.backing_device_mount_point,
+ ) {
+ let mount_point_path = std::path::Path::new(&mount_point);
+ for job in crate::server::TaskListInfoIterator::new(true)? {
+ let job = match job {
+ Ok(job) => job,
+ Err(_) => break,
+ };
+
+ if !job.upid.worker_type.eq("unmount")
+ && job.upid.worker_id.map_or(false, |id| id.contains(&store))
+ {
+ bail!(
+ "Can't unmount '{}' because there is a '{}' job still running!",
+ &store_config.name,
+ job.upid.worker_type
+ );
+ }
+ }
+ unmount_by_mount_point(&mount_point_path)
+ } else {
+ bail!(
+ "Datastore '{}' can't be mounted because it is not removable.",
+ &store_config.name
+ );
+ }
+ },
+ )?;
+
+ Ok(json!(upid_str))
+}
+
#[sortable]
const DATASTORE_INFO_SUBDIRS: SubdirMap = &[
(
@@ -1904,6 +2038,11 @@ const DATASTORE_INFO_SUBDIRS: SubdirMap = &[
.get(&API_METHOD_LIST_GROUPS)
.delete(&API_METHOD_DELETE_GROUP)
),
+ (
+ "mount",
+ &Router::new()
+ .post(&API_METHOD_MOUNT)
+ ),
(
"notes",
&Router::new()
@@ -1941,6 +2080,11 @@ const DATASTORE_INFO_SUBDIRS: SubdirMap = &[
&Router::new()
.get(&API_METHOD_STATUS)
),
+ (
+ "unmount",
+ &Router::new()
+ .post(&API_METHOD_UNMOUNT)
+ ),
(
"upload-backup-log",
&Router::new()
--
2.30.2
next prev parent reply other threads:[~2021-08-19 11:04 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-19 11:03 [pbs-devel] [PATCH proxmox-backup 00/15] (partially)close #3156: Add support for removable datastores Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 01/15] tools: add disks utility functions Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 02/15] config: add uuid+mountpoint to DataStoreConfig Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 03/15] api2: add support for removable datastore creation Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 04/15] backup: add check_if_available function to ds Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 05/15] api2: add 'is_available' to DataStoreConfig Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 06/15] api2: add 'removable' to DataStoreListItem Hannes Laimer
2021-08-19 11:03 ` Hannes Laimer [this message]
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 08/15] pbs: add mount-removable command to commandSocket Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 09/15] pbs-manager: add 'send-command' command Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 10/15] debian: add udev rule for removable datastores Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 11/15] ui: show usb icon for removable datastore in list Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 12/15] ui: add 'removable' checkbox in datastore creation Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 13/15] ui: display row as disabled in ds statistics Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 14/15] ui: show backing device UUID in option tab Hannes Laimer
2021-08-19 11:03 ` [pbs-devel] [PATCH proxmox-backup 15/15] ui: add (un)mount button to summary Hannes Laimer
2021-08-27 8:03 ` [pbs-devel] [PATCH proxmox-backup 00/15] (partially)close #3156: Add support for removable datastores Lorenz Stechauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210819110343.8708-8-h.laimer@proxmox.com \
--to=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox