Page MenuHomePhabricator
Files F3326114

D13932.diff
No OneTemporary
Actions

D13932.diff
View Options

diff --git a/native/native_rust_library/src/backup/file_info.rs b/native/native_rust_library/src/backup/file_info.rs
--- a/native/native_rust_library/src/backup/file_info.rs
+++ b/native/native_rust_library/src/backup/file_info.rs
@@ -4,7 +4,7 @@
lazy_static! {
static ref BACKUP_DATA_FILE_REGEX: Regex = Regex::new(
- r"^backup-(?<backup_id>[^-]*)(?:-log-(?<log_id>\d*))?(?<additional_data>-userkeys|-attachments)?$"
+ r"^backup-(?<backup_id>[^-]*)(-userkeys)?(?:-log-(?<log_id>\d*))?(?<additional_data>-attachments)?$"
)
.expect("Regex compilation failed");
}
diff --git a/native/native_rust_library/src/backup/upload_handler.rs b/native/native_rust_library/src/backup/upload_handler.rs
--- a/native/native_rust_library/src/backup/upload_handler.rs
+++ b/native/native_rust_library/src/backup/upload_handler.rs
@@ -130,36 +130,43 @@
Err(err) => return Err(err.into()),
};
+ let mut compaction_ids = HashSet::new();
+ let mut logs = Vec::new();
+
while let Some(file) = file_stream.next_entry().await? {
let path = file.path();
-
- if logs_waiting_for_confirmation.lock()?.contains(&path) {
- continue;
- }
-
- let Ok(BackupFileInfo {
+ if let Ok(BackupFileInfo {
backup_id,
log_id,
additional_data,
}) = path.clone().try_into()
- else {
- continue;
- };
+ {
+ // Skip additional data files (attachments). They will be
+ // handled when we iterate over the corresponding files with the
+ // main content
+ if additional_data.is_some() {
+ continue;
+ }
- // Skip additional data files (attachments, user keys). They will be
- // handled when we iterate over the corresponding files with the
- // main content
- if additional_data.is_some() {
- continue;
+ match log_id {
+ Some(id) => logs.push((path, backup_id, id)),
+ None => {
+ compaction_ids.insert(backup_id);
+ }
+ }
}
+ }
- if let Some(log_id) = log_id {
- log::upload_files(tx, backup_id, log_id).await?;
- logs_waiting_for_confirmation.lock()?.insert(path);
- } else {
- compaction::upload_files(backup_client, user_identity, backup_id)
- .await?;
+ for backup_id in compaction_ids {
+ compaction::upload_files(backup_client, user_identity, backup_id).await?;
+ }
+
+ for (path, backup_id, log_id) in logs {
+ if logs_waiting_for_confirmation.lock()?.contains(&path) {
+ continue;
}
+ log::upload_files(tx, backup_id, log_id).await?;
+ logs_waiting_for_confirmation.lock()?.insert(path.clone());
}
TRIGGER_BACKUP_FILE_UPLOAD.notified().await;

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 21, 7:07 AM (3 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2550282
Default Alt Text
D13932.diff (2 KB)

Event Timeline