[pbs-devel] [PATCH proxmox-backup v4 1/3] datastore: improve sync level code a bit
Dominik Csapak
d.csapak at proxmox.com
Fri Oct 28 09:34:47 CEST 2022
fixups for DatastoreFSyncLevel:
* use derive for Default
* add some more derives (Clone, Copy)
chunk store:
* drop to_owned for chunk_dir_path
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
pbs-api-types/src/datastore.rs | 9 ++-------
pbs-datastore/src/chunk_store.rs | 5 ++---
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index 865a7b55..4c9eda2f 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -169,7 +169,7 @@ pub enum ChunkOrder {
}
#[api]
-#[derive(PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "lowercase")]
/// The level of syncing that is done when writing into a datastore.
pub enum DatastoreFSyncLevel {
@@ -181,6 +181,7 @@ pub enum DatastoreFSyncLevel {
/// which reduces IO pressure.
/// But it may cause losing data on powerloss or system crash without any uninterruptible power
/// supply.
+ #[default]
None,
/// Triggers a fsync after writing any chunk on the datastore. While this can slow down
/// backups significantly, depending on the underlying file system and storage used, it
@@ -198,12 +199,6 @@ pub enum DatastoreFSyncLevel {
Filesystem,
}
-impl Default for DatastoreFSyncLevel {
- fn default() -> Self {
- DatastoreFSyncLevel::None
- }
-}
-
#[api(
properties: {
"chunk-order": {
diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs
index a8582485..75880331 100644
--- a/pbs-datastore/src/chunk_store.rs
+++ b/pbs-datastore/src/chunk_store.rs
@@ -470,11 +470,10 @@ impl ChunkStore {
let chunk_dir_path = chunk_path
.parent()
- .ok_or_else(|| format_err!("unable to get chunk dir"))?
- .to_owned();
+ .ok_or_else(|| format_err!("unable to get chunk dir"))?;
proxmox_sys::fs::replace_file(
- chunk_path,
+ &chunk_path,
raw_data,
CreateOptions::new(),
self.sync_level == DatastoreFSyncLevel::File,
--
2.30.2
More information about the pbs-devel
mailing list