Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-06 16:36:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove try_many_times r2d2 bug workaround

Browse Source
This commit is contained in:
link2xt
2023-02-18 01:57:19 +00:00
parent bfd3c1763d
commit b2c5560e30
1 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/accounts.rs
View File

@@ -1,7 +1,6 @@
//! # Account manager module. //! # Account manager module.
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::future::Future;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use anyhow::{ensure, Context as _, Result}; use anyhow::{ensure, Context as _, Result};
@@ -151,7 +150,7 @@ impl Accounts {
if let Some(cfg) = self.config.get_account(id) { if let Some(cfg) = self.config.get_account(id) {
let account_path = self.dir.join(cfg.dir); let account_path = self.dir.join(cfg.dir);
try_many_times(|| fs::remove_dir_all(&account_path)) fs::remove_dir_all(&account_path)
.await .await
.context("failed to remove account data")?; .context("failed to remove account data")?;
} }
@@ -187,10 +186,10 @@ impl Accounts {
fs::create_dir_all(self.dir.join(&account_config.dir)) fs::create_dir_all(self.dir.join(&account_config.dir))
.await .await
.context("failed to create dir")?; .context("failed to create dir")?;
try_many_times(|| fs::rename(&dbfile, &new_dbfile)) fs::rename(&dbfile, &new_dbfile)
.await .await
.context("failed to rename dbfile")?; .context("failed to rename dbfile")?;
try_many_times(|| fs::rename(&blobdir, &new_blobdir)) fs::rename(&blobdir, &new_blobdir)
.await .await
.context("failed to rename blobdir")?; .context("failed to rename blobdir")?;
if walfile.exists() { if walfile.exists() {
@@ -215,7 +214,7 @@ impl Accounts {
} }
Err(err) => { Err(err) => {
let account_path = std::path::PathBuf::from(&account_config.dir); let account_path = std::path::PathBuf::from(&account_config.dir);
try_many_times(|| fs::remove_dir_all(&account_path)) fs::remove_dir_all(&account_path)
.await .await
.context("failed to remove account data")?; .context("failed to remove account data")?;
self.config.remove_account(account_config.id).await?; self.config.remove_account(account_config.id).await?;
@@ -472,33 +471,6 @@ impl Config {
} }
} }
/// Spend up to 1 minute trying to do the operation.
///
/// Files may remain locked up to 30 seconds due to r2d2 bug:
/// <https://github.com/sfackler/r2d2/issues/99>
async fn try_many_times<F, Fut, T>(f: F) -> std::result::Result<(), T>
where
F: Fn() -> Fut,
Fut: Future<Output = std::result::Result<(), T>>,
{
let mut counter = 0;
loop {
counter += 1;
if let Err(err) = f().await {
if counter > 60 {
return Err(err);
}
// Wait 1 second and try again.
tokio::time::sleep(std::time::Duration::from_millis(1000)).await;
} else {
break;
}
}
Ok(())
}
/// Configuration of a single account. /// Configuration of a single account.
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)] #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
struct AccountConfig { struct AccountConfig {