mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions 1

Fix sql error when restoring from interrupted sync

Browse source
This commit is contained in:
automated-signal 2025-02-12 14:17:49 -06:00 • committed by GitHub
parent 3dfc61cae3
commit 5855b259f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ts/services/backups/index.ts
View file

@ -348,6 +348,7 @@ export class BackupsService {
const importStart = Date.now(); const importStart = Date.now();
await DataWriter.disableMessageInsertTriggers(); await DataWriter.disableMessageInsertTriggers();
await DataWriter.disableFSync();
try { try {
window.ConversationController.setReadOnly(true); window.ConversationController.setReadOnly(true);
@ -445,6 +446,7 @@ export class BackupsService {
window.ConversationController.setReadOnly(false); window.ConversationController.setReadOnly(false);
this.#isRunning = false; this.#isRunning = false;
await DataWriter.enableMessageInsertTriggersAndBackfill(); await DataWriter.enableMessageInsertTriggersAndBackfill();
await DataWriter.enableFSyncAndCheckpoint();
window.IPC.stopTrackingQueryStats({ epochName: 'Backup Import' }); window.IPC.stopTrackingQueryStats({ epochName: 'Backup Import' });
if (window.SignalCI) { if (window.SignalCI) {

3
ts/sql/Interface.ts
View file

@ -1011,6 +1011,9 @@ type WritableInterface = {
enableMessageInsertTriggersAndBackfill(): void; enableMessageInsertTriggersAndBackfill(): void;
ensureMessageInsertTriggersAreEnabled(): void; ensureMessageInsertTriggersAreEnabled(): void;
disableFSync(): void;
enableFSyncAndCheckpoint(): void;
processGroupCallRingCancellation(ringId: bigint): void; processGroupCallRingCancellation(ringId: bigint): void;
cleanExpiredGroupCallRingCancellations(): void; cleanExpiredGroupCallRingCancellations(): void;
}; };

25
ts/sql/Server.ts
View file

@ -541,6 +541,9 @@ export const DataWriter: ServerWritableInterface = {
enableMessageInsertTriggersAndBackfill, enableMessageInsertTriggersAndBackfill,
ensureMessageInsertTriggersAreEnabled, ensureMessageInsertTriggersAreEnabled,
disableFSync,
enableFSyncAndCheckpoint,
// Server-only // Server-only
removeKnownStickers, removeKnownStickers,
@ -7490,9 +7493,6 @@ function disableMessageInsertTriggers(db: WritableDB): void {
db.exec('DROP TRIGGER IF EXISTS messages_on_insert;'); db.exec('DROP TRIGGER IF EXISTS messages_on_insert;');
db.exec('DROP TRIGGER IF EXISTS messages_on_insert_insert_mentions;'); db.exec('DROP TRIGGER IF EXISTS messages_on_insert_insert_mentions;');
})(); })();
db.pragma('checkpoint_fullfsync = false');
db.pragma('synchronous = OFF');
} }
const selectMentionsFromMessages = ` const selectMentionsFromMessages = `
@ -7503,6 +7503,19 @@ const selectMentionsFromMessages = `
WHERE bodyRanges.value ->> 'mentionAci' IS NOT NULL WHERE bodyRanges.value ->> 'mentionAci' IS NOT NULL
`; `;
function disableFSync(db: WritableDB): void {
db.pragma('checkpoint_fullfsync = false');
db.pragma('synchronous = OFF');
}
function enableFSyncAndCheckpoint(db: WritableDB): void {
db.pragma('checkpoint_fullfsync = true');
db.pragma('synchronous = FULL');
// Finally fully commit WAL into the database
db.pragma('wal_checkpoint(FULL)');
}
function enableMessageInsertTriggersAndBackfill(db: WritableDB): void { function enableMessageInsertTriggersAndBackfill(db: WritableDB): void {
const createTriggersQuery = ` const createTriggersQuery = `
DROP TRIGGER IF EXISTS messages_on_insert; DROP TRIGGER IF EXISTS messages_on_insert;
@ -7532,12 +7545,6 @@ function enableMessageInsertTriggersAndBackfill(db: WritableDB): void {
value: false, value: false,
}); });
})(); })();
db.pragma('checkpoint_fullfsync = true');
db.pragma('synchronous = FULL');
// Finally fully commit WAL into the database
db.pragma('wal_checkpoint(FULL)');
} }
function backfillMessagesFtsTable(db: WritableDB): void { function backfillMessagesFtsTable(db: WritableDB): void {