Remove expected FS events
This commit is contained in:
parent
cd08cd80c7
commit
935ed9c8e7
13 changed files with 129 additions and 243 deletions
|
|
@ -1,5 +1,5 @@
|
|||
database:
|
||||
databases_directory_path: /tmp/databases
|
||||
databases_directory_path: /host/tmp/vaultlink-e2e-databases
|
||||
max_connections_per_vault: 8
|
||||
cursor_timeout: 1m
|
||||
server:
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ pub const DEFAULT_LOG_ROTATION_INTERVAL: Duration = Duration::from_hours(24);
|
|||
pub const IDLE_POOL_TIMEOUT: Duration = Duration::from_mins(5);
|
||||
|
||||
/// Fail fast on pool acquire so a transiently locked database surfaces as
|
||||
/// a 429 in seconds, not after a 30s busy_timeout. Callers retry.
|
||||
/// a 429 in seconds, not after a 30s `busy_timeout`. Callers retry.
|
||||
pub const POOL_ACQUIRE_TIMEOUT: Duration = Duration::from_secs(5);
|
||||
pub const GRACEFUL_SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(10);
|
||||
pub const HANDSHAKE_TIMEOUT: Duration = Duration::from_secs(10);
|
||||
|
|
|
|||
|
|
@ -244,7 +244,8 @@ pub async fn update_document(
|
|||
let content_clone = content.clone();
|
||||
|
||||
let merged = tokio::task::spawn_blocking(move || {
|
||||
let merged = reconcile(
|
||||
|
||||
reconcile(
|
||||
&parent_owned,
|
||||
&latest_owned.into(),
|
||||
&new_owned.into(),
|
||||
|
|
@ -252,8 +253,7 @@ pub async fn update_document(
|
|||
)
|
||||
.apply()
|
||||
.text()
|
||||
.into_bytes();
|
||||
merged
|
||||
.into_bytes()
|
||||
})
|
||||
.await
|
||||
.map_err(|e| server_error(anyhow::anyhow!("Reconcile task failed: {e}")))?;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue