diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-02-27 23:35:24 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-02-27 23:35:24 +0000 |
| commit | 6532d211951a52c62d2617340447f6bafd540e92 (patch) | |
| tree | 94f1d9216cb65c1fe1644ad3560e818ec8fa801c | |
| parent | fd4c6a9fbbd6bb9999931ae6b079dd073f0ab3b0 (diff) | |
Allow read-only account check without taking a write lock on account.
| -rw-r--r-- | BUGS.txt | 1 | ||||
| -rw-r--r-- | lib/backupstore/BackupStoreAccounts.cpp | 3 | ||||
| -rw-r--r-- | lib/backupstore/BackupStoreCheck.cpp | 9 |
3 files changed, 9 insertions, 4 deletions
@@ -13,3 +13,4 @@ Bugs * more automated tests for win32 * change off_t to box_off_t in preparation for win32 large file support * support large files on win32 by using native *i64 functions instead of posix +* when storage is implemented, ensure that no write operations can happen to an account that's opened read-only (BackupStoreCheck without fix) diff --git a/lib/backupstore/BackupStoreAccounts.cpp b/lib/backupstore/BackupStoreAccounts.cpp index 3fa9d242..bbf85f8a 100644 --- a/lib/backupstore/BackupStoreAccounts.cpp +++ b/lib/backupstore/BackupStoreAccounts.cpp @@ -601,7 +601,8 @@ int BackupStoreAccountsControl::CheckAccount(int32_t ID, bool FixErrors, bool Qu std::auto_ptr<UnixUser> user; // used to reset uid when we return NamedLock writeLock; - if(!OpenAccount(ID, rootDir, discSetNum, user, &writeLock)) + if(!OpenAccount(ID, rootDir, discSetNum, user, + FixErrors ? &writeLock : NULL)) // don't need a write lock if not making changes { BOX_ERROR("Failed to open account " << BOX_FORMAT_ACCOUNT(ID) << " for checking."); diff --git a/lib/backupstore/BackupStoreCheck.cpp b/lib/backupstore/BackupStoreCheck.cpp index de49c3e1..128d97d4 100644 --- a/lib/backupstore/BackupStoreCheck.cpp +++ b/lib/backupstore/BackupStoreCheck.cpp @@ -92,9 +92,12 @@ BackupStoreCheck::~BackupStoreCheck() // -------------------------------------------------------------------------- void BackupStoreCheck::Check() { - std::string writeLockFilename; - StoreStructure::MakeWriteLockFilename(mStoreRoot, mDiscSetNumber, writeLockFilename); - ASSERT(FileExists(writeLockFilename)); + if(mFixErrors) + { + std::string writeLockFilename; + StoreStructure::MakeWriteLockFilename(mStoreRoot, mDiscSetNumber, writeLockFilename); + ASSERT(FileExists(writeLockFilename)); + } if(!mQuiet && mFixErrors) { |