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 74B1A7AFE2 for ; Thu, 7 Jul 2022 11:11:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 640281CCA0 for ; Thu, 7 Jul 2022 11:11:25 +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 ; Thu, 7 Jul 2022 11:11:24 +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 74BEB43DDC for ; Thu, 7 Jul 2022 11:11:24 +0200 (CEST) Message-ID: <1587b21b-8b8a-0214-9706-29221bee8a2f@proxmox.com> Date: Thu, 7 Jul 2022 11:11:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: Wolfgang Bumiller Cc: pbs-devel@lists.proxmox.com References: <20220705130834.14285-1-h.laimer@proxmox.com> <20220705130834.14285-12-h.laimer@proxmox.com> <20220706114348.ls53m5eftcjgxl7m@casey.proxmox.com> From: Hannes Laimer In-Reply-To: <20220706114348.ls53m5eftcjgxl7m@casey.proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.041 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup 09/26] api2: admin: add unmount-device endpoint to datastore 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: Thu, 07 Jul 2022 09:11:55 -0000 Am 06.07.22 um 13:43 schrieb Wolfgang Bumiller: > On Tue, Jul 05, 2022 at 01:08:17PM +0000, Hannes Laimer wrote: >> unmounts the removable device mounted at the datstore path and set the >> maintenance-mode of the datastore to 'unplugged'. The worker waits for >> all running tasks to finish before unmounting. >> >> Signed-off-by: Hannes Laimer >> --- >> src/api2/admin/datastore.rs | 97 +++++++++++++++++++++++++++++++++---- >> 1 file changed, 87 insertions(+), 10 deletions(-) >> >> diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs >> index 5448fa10..2be95f92 100644 >> --- a/src/api2/admin/datastore.rs >> +++ b/src/api2/admin/datastore.rs >> @@ -22,27 +22,28 @@ use proxmox_router::{ >> Router, RpcEnvironment, RpcEnvironmentType, SubdirMap, >> }; >> use proxmox_schema::*; >> +use proxmox_section_config::SectionConfigData; >> use proxmox_sys::fs::{ >> file_read_firstline, file_read_optional_string, replace_file, CreateOptions, >> }; >> -use proxmox_sys::sortable; >> -use proxmox_sys::{task_log, task_warn}; >> +use proxmox_sys::{sortable, task_log, task_warn, WorkerTaskContext}; >> >> use pxar::accessor::aio::Accessor; >> use pxar::EntryKind; >> >> use pbs_api_types::{ >> print_ns_and_snapshot, print_store_and_ns, Authid, BackupContent, BackupNamespace, BackupType, >> - Counts, CryptMode, DataStoreListItem, DataStoreStatus, GarbageCollectionStatus, GroupListItem, >> - KeepOptions, Operation, PruneJobOptions, RRDMode, RRDTimeFrame, SnapshotListItem, >> - SnapshotVerifyState, BACKUP_ARCHIVE_NAME_SCHEMA, BACKUP_ID_SCHEMA, BACKUP_NAMESPACE_SCHEMA, >> - BACKUP_TIME_SCHEMA, BACKUP_TYPE_SCHEMA, DATASTORE_SCHEMA, IGNORE_VERIFIED_BACKUPS_SCHEMA, >> - MAX_NAMESPACE_DEPTH, NS_MAX_DEPTH_SCHEMA, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_BACKUP, >> - PRIV_DATASTORE_MODIFY, PRIV_DATASTORE_PRUNE, PRIV_DATASTORE_READ, PRIV_DATASTORE_VERIFY, >> - UPID_SCHEMA, VERIFICATION_OUTDATED_AFTER_SCHEMA, >> + Counts, CryptMode, DataStoreConfig, DataStoreListItem, DataStoreStatus, >> + GarbageCollectionStatus, GroupListItem, KeepOptions, MaintenanceMode, MaintenanceType, >> + Operation, PruneJobOptions, RRDMode, RRDTimeFrame, SnapshotListItem, SnapshotVerifyState, >> + BACKUP_ARCHIVE_NAME_SCHEMA, BACKUP_ID_SCHEMA, BACKUP_NAMESPACE_SCHEMA, BACKUP_TIME_SCHEMA, >> + BACKUP_TYPE_SCHEMA, DATASTORE_SCHEMA, IGNORE_VERIFIED_BACKUPS_SCHEMA, MAX_NAMESPACE_DEPTH, >> + NS_MAX_DEPTH_SCHEMA, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_MODIFY, >> + PRIV_DATASTORE_PRUNE, PRIV_DATASTORE_READ, PRIV_DATASTORE_VERIFY, UPID_SCHEMA, >> + VERIFICATION_OUTDATED_AFTER_SCHEMA, >> }; >> use pbs_client::pxar::{create_tar, create_zip}; >> -use pbs_config::CachedUserInfo; >> +use pbs_config::{BackupLockGuard, CachedUserInfo}; >> use pbs_datastore::backup_info::BackupInfo; >> use pbs_datastore::cached_chunk_reader::CachedChunkReader; >> use pbs_datastore::catalog::{ArchiveEntry, CatalogReader}; >> @@ -106,6 +107,39 @@ fn check_privs_and_load_store( >> Ok(datastore) >> } >> >> +fn do_unmount_device( >> + _lock: BackupLockGuard, >> + mut config: SectionConfigData, >> + mut datastore: DataStoreConfig, >> + worker: Option<&dyn WorkerTaskContext>, >> +) -> Result<(), Error> { >> + datastore.set_maintenance_mode(MaintenanceMode::new(MaintenanceType::Unplugged, None)); >> + config.set_data(&datastore.name, "datastore", &datastore)?; >> + pbs_config::datastore::save_config(&config)?; >> + drop(_lock); >> + >> + let mut active_operations = task_tracking::get_active_operations(&datastore.name)?; >> + while active_operations.read + active_operations.write > 0 { > > I'd again prefer to fail than loop endlessly... The idea was you start some sync/verify and then go to sleep or smth, so it would unmount the device asap. But yes, we can also fail. > >> + if let Some(worker) = worker { >> + if worker.abort_requested() { >> + bail!("aborted, due to user request"); >> + } >> + task_log!( >> + worker, >> + "can't unmount yet, still {} read and {} write operations active", >> + active_operations.read, >> + active_operations.write >> + ); >> + } >> + >> + std::thread::sleep(std::time::Duration::new(5, 0)); >> + active_operations = task_tracking::get_active_operations(&datastore.name)?; >> + } >> + >> + crate::tools::disks::unmount_by_mountpoint(&datastore.path)?; >> + >> + Ok(()) >> +} >> fn read_backup_index( >> backup_dir: &BackupDir, >> ) -> Result<(BackupManifest, Vec), Error> {