fix: add DataRestoreConstraint to StorageSyncJob#734
Open
bearyjd wants to merge 1 commit intomollyim:mainfrom
Open
fix: add DataRestoreConstraint to StorageSyncJob#734bearyjd wants to merge 1 commit intomollyim:mainfrom
bearyjd wants to merge 1 commit intomollyim:mainfrom
Conversation
StorageSyncJob can run during local backup restore, attempting to sync with Signal servers before the database is ready. This causes restore to fail or hang. Add DataRestoreConstraint to prevent StorageSyncJob from executing while a backup restore is in progress, matching the pattern already used by RebuildMessageSearchIndexJob. Fixes mollyim#733
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
DataRestoreConstrainttoStorageSyncJobto prevent it from running during local backup restoreProblem
During local backup restore,
StorageSyncJobcan execute before the restore completes, attempting to sync with Signal's storage service while the database is still being populated. This causes the restore to fail or hang indefinitely.Fix
Add
.addConstraint(DataRestoreConstraint.KEY)toStorageSyncJob'sParameters.Builder. This follows the same pattern already used byRebuildMessageSearchIndexJob, which correctly blocks during restore.When
DataRestoreConstraint.isRestoringDataistrue(set byRestoreRepositoryat the start of restore), the constraint preventsStorageSyncJobfrom executing. Once restore completes and the flag is cleared, the job proceeds normally.Changes
StorageSyncJob.kt: AddedDataRestoreConstraint.KEYconstraint and its import (2 lines)Test plan
Fixes #733