From 6532d211951a52c62d2617340447f6bafd540e92 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 27 Feb 2014 23:35:24 +0000 Subject: Allow read-only account check without taking a write lock on account. --- lib/backupstore/BackupStoreAccounts.cpp | 3 ++- lib/backupstore/BackupStoreCheck.cpp | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/backupstore') 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 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) { -- cgit v1.2.3