cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(storage-usage): keep trashed files in usage till they a permenently deleted

Browse Source
This commit is contained in:
Edouard Vanbelle
2026-08-02 12:34:42 +02:00
parent 4297d8139a
commit c0878a7928
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/application/services/storage_usage_service.rs
+6 -1
View File
@@ -752,6 +752,12 @@ impl StorageUsagePort for StorageUsageService {
/// FROM` guard to skip no-op rewrites so idle drives don't churn /// FROM` guard to skip no-op rewrites so idle drives don't churn
/// dead tuples. Runs from the same reconciliation ticker as the /// dead tuples. Runs from the same reconciliation ticker as the
/// user sweep; failure is logged but doesn't stop the next tick. /// user sweep; failure is logged but doesn't stop the next tick.
///
/// Trashed files ARE included in the sum — matching the hot-path
/// delta which never decrements on `move_to_trash`. Trash weight
/// stays billed to the drive/user until permanent deletion (that's
/// when the delta subtracts). Excluding trash here would make
/// `used_bytes` oscillate between sweep runs and delta writes.
async fn update_all_drives_storage_usage(&self) -> Result<u64, DomainError> { async fn update_all_drives_storage_usage(&self) -> Result<u64, DomainError> {
debug!("Starting drive storage-usage reconciliation sweep"); debug!("Starting drive storage-usage reconciliation sweep");
let result = sqlx::query( let result = sqlx::query(
@@ -762,7 +768,6 @@ impl StorageUsagePort for StorageUsageService {
LEFT JOIN ( LEFT JOIN (
SELECT drive_id, SUM(size)::bigint AS total SELECT drive_id, SUM(size)::bigint AS total
FROM storage.files FROM storage.files
WHERE NOT is_trashed
GROUP BY drive_id GROUP BY drive_id
) t ON t.drive_id = d2.id ) t ON t.drive_id = d2.id
WHERE d.id = d2.id WHERE d.id = d2.id