Changeset 2702 for box/trunk/lib/backupstore/BackupStoreCheck2.cpp

Timestamp:

27/08/2010 10:18:57 (21 months ago)

Author:

chris

Message:

Change the store info file format to include an account name and the
number of blocks in current (not old or deleted) files, an
often-requested feature since this number is difficult to calculate
otherwise, because files may be both old and deleted, thus counted
twice.

File:

• box/trunk/lib/backupstore/BackupStoreCheck2.cpp (modified) (6 diffs)

box/trunk/lib/backupstore/BackupStoreCheck2.cpp

@@ -574 +574 @@
 {
         // Attempt to load the existing store info file
-        std::auto_ptr<BackupStoreInfo> poldInfo;
+        std::auto_ptr<BackupStoreInfo> pOldInfo;
         try
         {
-                poldInfo.reset(BackupStoreInfo::Load(mAccountID, mStoreRoot, mDiscSetNumber, true /* read only */).release());
+                pOldInfo.reset(BackupStoreInfo::Load(mAccountID, mStoreRoot, mDiscSetNumber, true /* read only */).release());
+                mAccountName = pOldInfo->GetAccountName();
         }
         catch(...)
@@ -584 +585 @@
                 ++mNumberErrorsFound;
         }
+
+        BOX_NOTICE("Total files: " << mNumFiles << " (of which "
+                "old files: " << mNumOldFiles << ", "
+                "deleted files: " << mNumDeletedFiles << "), "
+                "directories: " << mNumDirectories);
 
         // Minimum soft and hard limits
@@ -590 +596 @@
 
         // Need to do anything?
-        if(poldInfo.get() != 0 && mNumberErrorsFound == 0 && poldInfo->GetAccountID() == mAccountID)
+        if(pOldInfo.get() != 0 &&
+                mNumberErrorsFound == 0 &&
+                pOldInfo->GetAccountID() == mAccountID)
         {
                 // Leave the store info as it is, no need to alter it because nothing really changed,
@@ -602 +610 @@
         int64_t softLimit = minSoft;
         int64_t hardLimit = minHard;
-        if(poldInfo.get() != 0 && poldInfo->GetBlocksSoftLimit() > minSoft)
-        {
-                softLimit = poldInfo->GetBlocksSoftLimit();
+        if(pOldInfo.get() != 0 && pOldInfo->GetBlocksSoftLimit() > minSoft)
+        {
+                softLimit = pOldInfo->GetBlocksSoftLimit();
         }
         else
         {
-                BOX_WARNING("Soft limit for account changed to ensure housekeeping doesn't delete files on next run.");
-        }
-        if(poldInfo.get() != 0 && poldInfo->GetBlocksHardLimit() > minHard)
-        {
-                hardLimit = poldInfo->GetBlocksHardLimit();
+                BOX_WARNING("Soft limit for account changed to ensure "
+                        "housekeeping doesn't delete files on next run.");
+        }
+        if(pOldInfo.get() != 0 && pOldInfo->GetBlocksHardLimit() > minHard)
+        {
+                hardLimit = pOldInfo->GetBlocksHardLimit();
         }
         else
         {
-                BOX_WARNING("Hard limit for account changed to ensure housekeeping doesn't delete files on next run.");
+                BOX_WARNING("Hard limit for account changed to ensure "
+                        "housekeeping doesn't delete files on next run.");
         }
         
@@ -629 +639 @@
         std::auto_ptr<BackupStoreInfo> info(BackupStoreInfo::CreateForRegeneration(
                 mAccountID,
+                mAccountName,
                 mStoreRoot,
                 mDiscSetNumber,
                 lastObjID,
                 mBlocksUsed,
+                mBlocksInCurrentFiles,
                 mBlocksInOldFiles,
                 mBlocksInDeletedFiles,
@@ -638 +650 @@
                 softLimit,
                 hardLimit));
+        info->AdjustNumFiles(mNumFiles);
+        info->AdjustNumOldFiles(mNumOldFiles);
+        info->AdjustNumDeletedFiles(mNumDeletedFiles);
+        info->AdjustNumDirectories(mNumDirectories);
+
+        if(pOldInfo.get())
+        {
+                mNumberErrorsFound += info->ReportChangesTo(*pOldInfo);
+        }
 
         // Save to disc?