lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Tricky: make sure that the accessor count is not reset to 0 if

Browse source 
recovery fails.
This commit is contained in:
Eelco Dolstra 2004-01-13 12:36:43 +00:00
parent 23fbc72f5d
commit 698e880c9f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/db.cc
View file

@ -155,6 +155,7 @@ void Database::open(const string & path)
/* Create the database environment object. */ /* Create the database environment object. */
DbEnv * env = 0; /* !!! close on error */
env = new DbEnv(0); env = new DbEnv(0);
env->set_lg_bsize(32 * 1024); /* default */ env->set_lg_bsize(32 * 1024); /* default */
@ -199,7 +200,6 @@ void Database::open(const string & path)
other readers or writers. */ other readers or writers. */
int n = getAccessorCount(fdAccessors); int n = getAccessorCount(fdAccessors);
setAccessorCount(fdAccessors, 1);
if (n != 0) { if (n != 0) {
printMsg(lvlTalkative, printMsg(lvlTalkative,
@ -213,6 +213,8 @@ void Database::open(const string & path)
/* Open the environment normally. */ /* Open the environment normally. */
openEnv(env, path, 0); openEnv(env, path, 0);
setAccessorCount(fdAccessors, 1);
/* Downgrade to a read lock. */ /* Downgrade to a read lock. */
debug(format("downgrading to read lock on `%1%'") % lockPath); debug(format("downgrading to read lock on `%1%'") % lockPath);
lockFile(fdLock, ltRead, true); lockFile(fdLock, ltRead, true);
@ -236,6 +238,8 @@ void Database::open(const string & path)
openEnv(env, path, 0); openEnv(env, path, 0);
} }
this->env = env;
} catch (DbException e) { rethrow(e); } } catch (DbException e) { rethrow(e); }
} }