From: Dietmar Maurer <dietmar@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>
Subject: [pbs-devel] applied: [PATCH proxmox-backup v2 3/4] backup/chunk_store: optionally log progress on creation
Date: Fri, 4 Jun 2021 09:40:38 +0200 [thread overview]
Message-ID: <ecff0994-f3db-cae9-e951-04d497ecb1ec@proxmox.com> (raw)
In-Reply-To: <20210602112704.893-4-d.csapak@proxmox.com>
applied
On 6/2/21 1:27 PM, Dominik Csapak wrote:
> and enable it for the worker variants
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> src/api2/config/datastore.rs | 5 +++--
> src/api2/node/disks/directory.rs | 2 +-
> src/api2/node/disks/zfs.rs | 2 +-
> src/backup/chunk_store.rs | 11 +++++++----
> 4 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
> index 4fa76b40..4e079cd5 100644
> --- a/src/api2/config/datastore.rs
> +++ b/src/api2/config/datastore.rs
> @@ -55,11 +55,12 @@ pub(crate) fn create_datastore_impl(
> _lock: std::fs::File,
> mut config: SectionConfigData,
> datastore: DataStoreConfig,
> + worker: Option<&dyn crate::task::TaskState>,
> ) -> Result<(), Error> {
> let path: PathBuf = datastore.path.clone().into();
>
> let backup_user = crate::backup::backup_user()?;
> - let _store = ChunkStore::create(&datastore.name, path, backup_user.uid, backup_user.gid)?;
> + let _store = ChunkStore::create(&datastore.name, path, backup_user.uid, backup_user.gid, worker)?;
>
> config.set_data(&datastore.name, "datastore", &datastore)?;
>
> @@ -158,7 +159,7 @@ pub fn create_datastore(
> Some(datastore.name.to_string()),
> auth_id,
> false,
> - move |_worker| create_datastore_impl(lock, config, datastore),
> + move |worker| create_datastore_impl(lock, config, datastore, Some(&worker)),
> )
> }
>
> diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs
> index 006e9522..4eadf867 100644
> --- a/src/api2/node/disks/directory.rs
> +++ b/src/api2/node/disks/directory.rs
> @@ -190,7 +190,7 @@ pub fn create_datastore_disk(
> bail!("datastore '{}' already exists.", datastore.name);
> }
>
> - crate::api2::config::datastore::create_datastore_impl(lock, config, datastore)?;
> + crate::api2::config::datastore::create_datastore_impl(lock, config, datastore, Some(&worker))?;
> }
>
> Ok(())
> diff --git a/src/api2/node/disks/zfs.rs b/src/api2/node/disks/zfs.rs
> index ee8037e2..ebdc3688 100644
> --- a/src/api2/node/disks/zfs.rs
> +++ b/src/api2/node/disks/zfs.rs
> @@ -384,7 +384,7 @@ pub fn create_zpool(
> bail!("datastore '{}' already exists.", datastore.name);
> }
>
> - crate::api2::config::datastore::create_datastore_impl(lock, config, datastore)?;
> + crate::api2::config::datastore::create_datastore_impl(lock, config, datastore, Some(&worker))?;
> }
>
> Ok(())
> diff --git a/src/backup/chunk_store.rs b/src/backup/chunk_store.rs
> index 31e8307c..e9cc3897 100644
> --- a/src/backup/chunk_store.rs
> +++ b/src/backup/chunk_store.rs
> @@ -7,6 +7,7 @@ use std::os::unix::io::AsRawFd;
>
> use proxmox::tools::fs::{CreateOptions, create_path, create_dir};
>
> +use crate::task_log;
> use crate::tools;
> use crate::api2::types::GarbageCollectionStatus;
>
> @@ -61,7 +62,7 @@ impl ChunkStore {
> chunk_dir
> }
>
> - pub fn create<P>(name: &str, path: P, uid: nix::unistd::Uid, gid: nix::unistd::Gid) -> Result<Self, Error>
> + pub fn create<P>(name: &str, path: P, uid: nix::unistd::Uid, gid: nix::unistd::Gid, worker: Option<&dyn TaskState>) -> Result<Self, Error>
> where
> P: Into<PathBuf>,
> {
> @@ -104,7 +105,9 @@ impl ChunkStore {
> }
> let percentage = (i*100)/(64*1024);
> if percentage != last_percentage {
> - // eprintln!("ChunkStore::create {}%", percentage);
> + if let Some(worker) = worker {
> + task_log!(worker, "Chunkstore create: {}%", percentage)
> + }
> last_percentage = percentage;
> }
> }
> @@ -461,7 +464,7 @@ fn test_chunk_store1() {
> assert!(chunk_store.is_err());
>
> let user = nix::unistd::User::from_uid(nix::unistd::Uid::current()).unwrap().unwrap();
> - let chunk_store = ChunkStore::create("test", &path, user.uid, user.gid).unwrap();
> + let chunk_store = ChunkStore::create("test", &path, user.uid, user.gid, None).unwrap();
>
> let (chunk, digest) = super::DataChunkBuilder::new(&[0u8, 1u8]).build().unwrap();
>
> @@ -472,7 +475,7 @@ fn test_chunk_store1() {
> assert!(exists);
>
>
> - let chunk_store = ChunkStore::create("test", &path, user.uid, user.gid);
> + let chunk_store = ChunkStore::create("test", &path, user.uid, user.gid, None);
> assert!(chunk_store.is_err());
>
> if let Err(_e) = std::fs::remove_dir_all(".testdir") { /* ignore */ }
next prev parent reply other threads:[~2021-06-04 7:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 11:27 [pbs-devel] [PATCH proxmox-backup v2 0/4] improve datastore removal/creation Dominik Csapak
2021-06-02 11:27 ` [pbs-devel] [PATCH proxmox-backup v2 1/4] proxmox-backup-proxy: fix leftover references on datastore removal Dominik Csapak
2021-06-04 6:24 ` Dietmar Maurer
2021-06-02 11:27 ` [pbs-devel] [PATCH proxmox-backup v2 2/4] api2/config/datastore: change create datastore api call to a worker Dominik Csapak
2021-06-04 7:07 ` [pbs-devel] applied: " Dietmar Maurer
2021-06-02 11:27 ` [pbs-devel] [PATCH proxmox-backup v2 3/4] backup/chunk_store: optionally log progress on creation Dominik Csapak
2021-06-04 7:40 ` Dietmar Maurer [this message]
2021-06-02 11:27 ` [pbs-devel] [PATCH proxmox-backup v2 4/4] ui: DataStoreList: add remove button Dominik Csapak
2021-06-04 7:52 ` [pbs-devel] applied: " Dietmar Maurer
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=ecff0994-f3db-cae9-e951-04d497ecb1ec@proxmox.com \
--to=dietmar@proxmox.com \
--cc=d.csapak@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