From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 329C296F4F for ; Tue, 16 Apr 2024 16:40:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0B3FC1D9ED for ; Tue, 16 Apr 2024 16:39:36 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 16 Apr 2024 16:39:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BA1854522C for ; Tue, 16 Apr 2024 16:39:34 +0200 (CEST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Tue, 16 Apr 2024 16:39:33 +0200 Message-Id: To: "Christian Ebner" , "Proxmox Backup Server development discussion" From: "Hannes Laimer" X-Mailer: aerc 0.17.0-78-g4ffbaa6b3946 References: <20240409110012.166472-1-h.laimer@proxmox.com> <20240409110012.166472-13-h.laimer@proxmox.com> In-Reply-To: X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 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 Subject: Re: [pbs-devel] [PATCH proxmox-backup v3 12/24] add auto-mounting for removable datastores X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Apr 2024 14:40:06 -0000 On Tue Apr 16, 2024 at 10:05 AM CEST, Christian Ebner wrote: > comments inline > > On 4/9/24 13:00, Hannes Laimer wrote: > > Signed-off-by: Hannes Laimer > > --- > > debian/proxmox-backup-server.install | 1 + > > debian/proxmox-backup-server.udev | 3 ++ > > etc/Makefile | 3 +- > > etc/removable-device-attach@.service.in | 8 +++ > > src/bin/proxmox_backup_manager/datastore.rs | 55 ++++++++++++++++++++= + > > 5 files changed, 69 insertions(+), 1 deletion(-) > > create mode 100644 etc/removable-device-attach@.service.in > >=20 > > diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-back= up-server.install > > index ee114ea3..cda01069 100644 > > --- a/debian/proxmox-backup-server.install > > +++ b/debian/proxmox-backup-server.install > > @@ -4,6 +4,7 @@ etc/proxmox-backup-daily-update.service /lib/systemd/sy= stem/ > > etc/proxmox-backup-daily-update.timer /lib/systemd/system/ > > etc/proxmox-backup-proxy.service /lib/systemd/system/ > > etc/proxmox-backup.service /lib/systemd/system/ > > +etc/removable-device-attach@.service /lib/systemd/system/ > > usr/bin/pmt > > usr/bin/pmtx > > usr/bin/proxmox-tape > > diff --git a/debian/proxmox-backup-server.udev b/debian/proxmox-backup-= server.udev > > index afdfb2bc..e21b8bc7 100644 > > --- a/debian/proxmox-backup-server.udev > > +++ b/debian/proxmox-backup-server.udev > > @@ -16,3 +16,6 @@ SUBSYSTEM=3D=3D"scsi_generic", SUBSYSTEMS=3D=3D"scsi"= , ATTRS{type}=3D=3D"1", ENV{ID_SCSI_SER > > SYMLINK+=3D"tape/by-id/scsi-$env{ID_SCSI_SERIAL}-sg" > > =20 > > LABEL=3D"persistent_storage_tape_end" > > + > > +# triggers the mounting of a removable device > > +ACTION=3D=3D"add", SUBSYSTEM=3D=3D"block", ENV{ID_FS_UUID}!=3D"", TAG+= =3D"systemd", ENV{SYSTEMD_WANTS}=3D"removable-device-attach@$env{ID_FS_UUID= }" > > \ No newline at end of file > > diff --git a/etc/Makefile b/etc/Makefile > > index 42f639f6..730de4f8 100644 > > --- a/etc/Makefile > > +++ b/etc/Makefile > > @@ -7,7 +7,8 @@ DYNAMIC_UNITS :=3D \ > > proxmox-backup-banner.service \ > > proxmox-backup-daily-update.service \ > > proxmox-backup.service \ > > - proxmox-backup-proxy.service > > + proxmox-backup-proxy.service \ > > + removable-device-attach@.service > > =20 > > all: $(UNITS) $(DYNAMIC_UNITS) pbs-enterprise.list > > =20 > > diff --git a/etc/removable-device-attach@.service.in b/etc/removable-de= vice-attach@.service.in > > new file mode 100644 > > index 00000000..fe256548 > > --- /dev/null > > +++ b/etc/removable-device-attach@.service.in > > @@ -0,0 +1,8 @@ > > +[Unit] > > +Description=3DTry to mount the removable device of a datastore with uu= id '%i'. > > +After=3Dproxmox-backup-proxy.service > > +Requires=3Dproxmox-backup-proxy.service > > + > > +[Service] > > +Type=3Dsimple > > +ExecStart=3D/usr/sbin/proxmox-backup-manager datastore uuid-mount --uu= id %i > > \ No newline at end of file > > diff --git a/src/bin/proxmox_backup_manager/datastore.rs b/src/bin/prox= mox_backup_manager/datastore.rs > > index f8462459..319d5eb0 100644 > > --- a/src/bin/proxmox_backup_manager/datastore.rs > > +++ b/src/bin/proxmox_backup_manager/datastore.rs > > @@ -195,6 +195,60 @@ async fn delete_datastore(mut param: Value, rpcenv= : &mut dyn RpcEnvironment) -> > > Ok(()) > > } > > =20 > > +#[api( > > + protected: true, > > + input: { > > + properties: { > > + uuid: { > > + type: String, > > + description: "The UUID of the device that should be mo= unted", > > + }, > > + "output-format": { > > + schema: OUTPUT_FORMAT, > > + optional: true, > > + }, > > + }, > > + }, > > +)] > > +/// Try mounting a removable datastore given the UUID. > > +async fn uuid_mount(mut param: Value, rpcenv: &mut dyn RpcEnvironment)= -> Result { > > + let output_format =3D extract_output_format(&mut param); > > + let uuid =3D param["uuid"] > > + .as_str() > > + .ok_or_else(|| format_err!("uuid has to be specified"))?; > > + > > + let info =3D &api2::config::datastore::API_METHOD_LIST_DATASTORES; > > + let data: Value =3D match info.handler { > > + ApiHandler::Sync(handler) =3D> (handler)(serde_json::json!({})= , info, rpcenv)?, > > + _ =3D> unreachable!(), > > + }; > > + > > + let store_name =3D data.as_array().and_then(|list| { > > + list.iter() > > + .filter_map(Value::as_object) > > + .find(|store| store.get("backing-device").map_or(false, |d= | d.eq(&uuid))) > > + .and_then(|s| s.get("name").and_then(Value::as_str)) > > + }); > > + > > + if let Some(store_name) =3D store_name { > > + let client =3D connect_to_localhost()?; > > + let result =3D client > > + .post( > > + &format!("api2/json/admin/datastore/{}/mount", store_n= ame), > > + None, > > + ) > > + .await?; > > Did not test this, but could this also be done by creating a new `param`= =20 > instance containing the `store` and `node` and call it via the code below= ? > ``` > let info =3D &api2::admin::datastore::API_METHOD_MOUNT; > let result =3D match info.handler { > ApiHandler::Sync(handler) =3D> (handler)(param, info, rpcenv)?, > _ =3D> unreachable!(), > }; > ``` > makes sense, will do in v4 > > + > > + view_task_result(&client, result, &output_format).await?; > > + Ok(Value::Null) > > + } else { > > + Err(format_err!( > > + "'{}' is not associated with any datastore", > > + &uuid > > + )) > > use bail and inline uuid, removing unneeded reference > > > + } > > +} > > + > > pub fn datastore_commands() -> CommandLineInterface { > > let cmd_def =3D CliCommandMap::new() > > .insert("list", CliCommand::new(&API_METHOD_LIST_DATASTORES)) > > @@ -240,6 +294,7 @@ pub fn datastore_commands() -> CommandLineInterface= { > > pbs_config::datastore::complete_calendar_event, > > ), > > ) > > + .insert("uuid-mount", CliCommand::new(&API_METHOD_UUID_MOUNT)) > > .insert( > > "remove", > > CliCommand::new(&API_METHOD_DELETE_DATASTORE)