[Box Backup-commit] COMMIT r3200 - box/trunk/lib/backupstore

[subversion at boxbackup.org]

Author: chris
Date: 2013-10-02 20:13:07 +0100 (Wed, 02 Oct 2013)
New Revision: 3200

Modified:
   box/trunk/lib/backupstore/BackupStoreCheck.cpp
Log:
Files are allowed to be both Old and Deleted.

Count them as Deleted, not as Old.

Modified: box/trunk/lib/backupstore/BackupStoreCheck.cpp
===================================================================
--- box/trunk/lib/backupstore/BackupStoreCheck.cpp	2013-09-30 08:29:03 UTC (rev 3199)
+++ box/trunk/lib/backupstore/BackupStoreCheck.cpp	2013-10-02 19:13:07 UTC (rev 3200)
@@ -746,13 +746,13 @@
 							BOX_FORMAT_OBJECTID(en->GetObjectID()) <<
 							" with flags " << en->GetFlags());
 					}
-					else // it's a good file, add to sizes
-					if(en->IsOld() && en->IsDeleted())
+					// otherwise it's a good file, add to sizes
+					else if(en->IsDeleted()) // even if it's Old,
+					// it's still Deleted, don't count it twice.
 					{
-						BOX_WARNING("File " << 
-							BOX_FORMAT_OBJECTID(en->GetObjectID()) <<
-							" is both old and deleted, "
-							"this should not happen!");
+						mNumFiles++;
+						mNumDeletedFiles++;
+						mBlocksInDeletedFiles += en->GetSizeInBlocks();
 					}
 					else if(en->IsOld())
 					{
@@ -760,12 +760,6 @@
 						mNumOldFiles++;
 						mBlocksInOldFiles += en->GetSizeInBlocks();
 					}
-					else if(en->IsDeleted())
-					{
-						mNumFiles++;
-						mNumDeletedFiles++;
-						mBlocksInDeletedFiles += en->GetSizeInBlocks();
-					}
 					else
 					{
 						mNumFiles++;