Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 04:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark some archive reconciliation logs as keepLonger.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-07-24 16:13:21 -04:00
committed by Michelle Tang
parent 7499bd77b4
commit 759a746e46
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/jobs/ArchiveAttachmentReconciliationJob.kt
View File

@@ -128,7 +128,7 @@ class ArchiveAttachmentReconciliationJob private constructor(
val mayNeedReUploadCount = mediaObjectsThatMayNeedReUpload.count val mayNeedReUploadCount = mediaObjectsThatMayNeedReUpload.count
if (mayNeedReUploadCount > 0) { if (mayNeedReUploadCount > 0) {
Log.w(TAG, "Found $mayNeedReUploadCount attachments that are present in the target snapshot, but could not be found on the CDN. This could be a bookkeeping error, or the upload may still be in progress. Checking.") Log.w(TAG, "Found $mayNeedReUploadCount attachments that are present in the target snapshot, but could not be found on the CDN. This could be a bookkeeping error, or the upload may still be in progress. Checking.", true)
var newBackupJobRequired = false var newBackupJobRequired = false
var bookkeepingErrorCount = 0 var bookkeepingErrorCount = 0
@@ -139,16 +139,16 @@ class ArchiveAttachmentReconciliationJob private constructor(
if (entry.isThumbnail) { if (entry.isThumbnail) {
val parentAttachmentId = SignalDatabase.attachments.getAttachmentIdByPlaintextHashAndRemoteKey(entry.plaintextHash, entry.remoteKey) val parentAttachmentId = SignalDatabase.attachments.getAttachmentIdByPlaintextHashAndRemoteKey(entry.plaintextHash, entry.remoteKey)
if (parentAttachmentId == null) { if (parentAttachmentId == null) {
Log.w(TAG, "Failed to find parent attachment for thumbnail that may need reupload. Skipping.") Log.w(TAG, "Failed to find parent attachment for thumbnail that may need reupload. Skipping.", true)
return@forEach return@forEach
} }
if (AppDependencies.jobManager.find { it.isForArchiveThumbnailUploadJob(parentAttachmentId) }.isEmpty()) { if (AppDependencies.jobManager.find { it.isForArchiveThumbnailUploadJob(parentAttachmentId) }.isEmpty()) {
Log.w(TAG, "A thumbnail was missing from remote for $parentAttachmentId and no in-progress job was found. Re-enqueueing one.") Log.w(TAG, "A thumbnail was missing from remote for $parentAttachmentId and no in-progress job was found. Re-enqueueing one.", true)
ArchiveThumbnailUploadJob.enqueueIfNecessary(parentAttachmentId) ArchiveThumbnailUploadJob.enqueueIfNecessary(parentAttachmentId)
bookkeepingErrorCount++ bookkeepingErrorCount++
} else { } else {
Log.i(TAG, "A thumbnail was missing from remote for $parentAttachmentId, but a job is already in progress.") Log.i(TAG, "A thumbnail was missing from remote for $parentAttachmentId, but a job is already in progress.", true)
} }
} else { } else {
val wasReset = SignalDatabase.attachments.resetArchiveTransferStateByPlaintextHashAndRemoteKeyIfNecessary(entry.plaintextHash, entry.remoteKey) val wasReset = SignalDatabase.attachments.resetArchiveTransferStateByPlaintextHashAndRemoteKeyIfNecessary(entry.plaintextHash, entry.remoteKey)
@@ -156,19 +156,19 @@ class ArchiveAttachmentReconciliationJob private constructor(
newBackupJobRequired = true newBackupJobRequired = true
bookkeepingErrorCount++ bookkeepingErrorCount++
} else { } else {
Log.w(TAG, "Did not need to reset the the transfer state by hash/key because the attachment either no longer exists or the upload is already in-progress.") Log.w(TAG, "Did not need to reset the the transfer state by hash/key because the attachment either no longer exists or the upload is already in-progress.", true)
} }
} }
} }
if (bookkeepingErrorCount > 0) { if (bookkeepingErrorCount > 0) {
Log.w(TAG, "Found that $bookkeepingErrorCount/$mayNeedReUploadCount of the CDN mismatches were bookkeeping errors.") Log.w(TAG, "Found that $bookkeepingErrorCount/$mayNeedReUploadCount of the CDN mismatches were bookkeeping errors.", true)
} else { } else {
Log.i(TAG, "None of the $mayNeedReUploadCount CDN mismatches were bookkeeping errors.") Log.i(TAG, "None of the $mayNeedReUploadCount CDN mismatches were bookkeeping errors.", true)
} }
if (newBackupJobRequired) { if (newBackupJobRequired) {
Log.w(TAG, "Some of the errors require re-uploading a new backup job to resolve.") Log.w(TAG, "Some of the errors require re-uploading a new backup job to resolve.", true)
BackupMessagesJob.enqueue() BackupMessagesJob.enqueue()
} }
} else { } else {