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

- Reestablish database lock after on-idle backup -- the lock was being lost, which allowed Standalone (and other SQLite clients) to corrupt the database

Browse source 
- Don't attempt to backup database on shutdown, since it doesn't seem to work anymore and can delay shutdown
- Change idle backup check timer to 60 seconds from 10 seconds
This commit is contained in:
Dan Stillman 2011-01-13 14:21:19 +00:00
parent 9176118494
commit f712ea8d40
1 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

48
chrome/content/zotero/xpcom/db.js
View file

@ -717,33 +717,13 @@ Zotero.DBConnection.prototype.getNextName = function (table, field, name)
/* /*
* Shutdown observer -- implements nsIObserver * Implements nsIObserver
*/ */
Zotero.DBConnection.prototype.observe = function(subject, topic, data) { Zotero.DBConnection.prototype.observe = function(subject, topic, data) {
switch (topic) { switch (topic) {
case 'idle': case 'idle':
this.backupDatabase(); this.backupDatabase();
break; break;
case 'xpcom-shutdown':
if (this._shutdown) {
this._debug('XPCOM already shut down in Zotero.DBConnection.observe()');
return;
}
// NOTE: disabled
//var level = this.commitAllTransactions();
var level = this.rollbackAllTransactions()
if (level) {
level = level === true ? '0' : level;
this._debug("A transaction in DB '" + this._dbName + "' was still open! (level " + level + ")", 2);
}
this._shutdown = true;
this.closeDatabase();
this.backupDatabase();
break;
} }
} }
@ -813,7 +793,7 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
} }
if (this.transactionInProgress()) { if (this.transactionInProgress()) {
this._debug("Transaction in progress--skipping backup of DB '" + this._dbName + "'", 2); //this._debug("Transaction in progress--skipping backup of DB '" + this._dbName + "'", 2);
return false; return false;
} }
@ -836,7 +816,6 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
if (backupFile.exists()) { if (backupFile.exists()) {
var currentDBTime = file.lastModifiedTime; var currentDBTime = file.lastModifiedTime;
var lastBackupTime = backupFile.lastModifiedTime; var lastBackupTime = backupFile.lastModifiedTime;
if (currentDBTime == lastBackupTime) { if (currentDBTime == lastBackupTime) {
//Zotero.debug("Database '" + this._dbName + "' hasn't changed -- skipping backup"); //Zotero.debug("Database '" + this._dbName + "' hasn't changed -- skipping backup");
return; return;
@ -870,7 +849,15 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
} }
} }
// Turn off DB locking before backup and reenable after, since otherwise
// the lock is lost
var dbLockExclusive = Zotero.Prefs.get('dbLockExclusive');
try { try {
if (dbLockExclusive) {
Zotero.DB.query("PRAGMA locking_mode=NORMAL");
}
Zotero.DB.stopDummyStatement();
var store = Components.classes["@mozilla.org/storage/service;1"]. var store = Components.classes["@mozilla.org/storage/service;1"].
getService(Components.interfaces.mozIStorageService); getService(Components.interfaces.mozIStorageService);
store.backupDatabaseFile(file, tmpFile.leafName, file.parent); store.backupDatabaseFile(file, tmpFile.leafName, file.parent);
@ -880,6 +867,12 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
Components.utils.reportError(e); Components.utils.reportError(e);
return false; return false;
} }
finally {
if (dbLockExclusive) {
Zotero.DB.query("PRAGMA locking_mode=EXCLUSIVE");
}
Zotero.DB.startDummyStatement();
}
// Opened database files can't be moved on Windows, so we have to skip // Opened database files can't be moved on Windows, so we have to skip
// the extra integrity check (unless we wanted to write two copies of // the extra integrity check (unless we wanted to write two copies of
@ -940,7 +933,7 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
backupFile.remove(false); backupFile.remove(false);
} }
Zotero.debug("Saving " + backupFile.leafName); Zotero.debug("Backed up to " + backupFile.leafName);
tmpFile.moveTo(tmpFile.parent, backupFile.leafName); tmpFile.moveTo(tmpFile.parent, backupFile.leafName);
return true; return true;
@ -1177,14 +1170,9 @@ Zotero.DBConnection.prototype._getDBConnection = function () {
// Register idle and shutdown handlers to call this.observe() for DB backup // Register idle and shutdown handlers to call this.observe() for DB backup
var idleService = Components.classes["@mozilla.org/widget/idleservice;1"] var idleService = Components.classes["@mozilla.org/widget/idleservice;1"]
.getService(Components.interfaces.nsIIdleService); .getService(Components.interfaces.nsIIdleService);
idleService.addIdleObserver(this, 10); // 10 minutes idleService.addIdleObserver(this, 60);
idleService = null; idleService = null;
var observerService = Components.classes["@mozilla.org/observer-service;1"]
.getService(Components.interfaces.nsIObserverService);
observerService.addObserver(this, "xpcom-shutdown", false);
observerService = null;
// User-defined functions // User-defined functions
// TODO: move somewhere else? // TODO: move somewhere else?