suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wait for any DB transactions to finish before starting sync

Browse Source 
purgeDataObjects(), which runs at the beginning of the sync process,
uses transactions, and those can fail after the default wait timeout if
there's another active transaction. Instead, check explicitly for
another transaction and, if there is one, display a nice message and
wait for it to finish. This isn't foolproof, but it should reduce the
frequency of "operation timed out" sync errors. (Avoiding all long
transactions would be a better solution.)

(cherry picked from commit bd7e1b222d)
This commit is contained in:
Dan Stillman 2018-02-08 03:06:06 -05:00
parent 6c18e9e260
commit b4311e08e2
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chrome/content/zotero/xpcom/sync/syncRunner.js
View File

@ -139,6 +139,19 @@ Zotero.Sync.Runner_Module = function (options = {}) {
this.updateIcons('animate');
// purgeDataObjects() starts a transaction, so if there's an active one then show a
// nice message and wait until there's not. Another transaction could still start
// before purgeDataObjects() and result in a wait timeout, but this should reduce the
// frequency of that.
while (Zotero.DB.inTransaction()) {
this.setSyncStatus(Zotero.getString('sync.status.waiting'));
Zotero.debug("Transaction in progress -- waiting to sync");
yield Zotero.DB.waitForTransaction('sync');
_stopCheck();
}
this.setSyncStatus(Zotero.getString('sync.status.preparing'));
// Purge deleted objects so they don't cause sync errors (e.g., long tags)
yield Zotero.purgeDataObjects(true);

2
chrome/locale/en-US/zotero/zotero.properties
View File

@ -965,6 +965,8 @@ sync.conflict.chooseThisVersion = Choose this version
sync.status.notYetSynced = Not yet synced
sync.status.lastSync = Last sync:
sync.status.waiting = Waiting for other operations to finish
sync.status.preparing = Preparing sync
sync.status.loggingIn = Logging in to sync server
sync.status.gettingUpdatedData = Getting updated data from sync server
sync.status.processingUpdatedData = Processing updated data from sync server