Directories' entries in parent directory should track current size.

When entries are added to a directory by a command (BackupStoreContext),
and when entries are removed from a directory (by housekeeping), update the
parent directory's entry for us if our size has changed.

Make BackupStoreCheck check for, report and fix errors when directory entries
are directories and the size is wrong (as well as files).

Conflicts:

	test/backupstore/testbackupstore.cpp

Fix directories loaded without size being set, leading to warnings later.

We can't check that the old size in the parent entry matched the old real size
of the directory, unless we set the old real size in the directory.

And we don't need to pass the old directory size to
HousekeepStoreAccount::DeleteFile, because we can get it from the directory
itself.

1 files changed, 25 insertions, 3 deletions

diff --git a/lib/backupstore/BackupStoreContext.cpp b/lib/backupstore/BackupStoreContext.cpp
index 33c2a660..974c4e3e 100644
--- a/lib/backupstore/BackupStoreContext.cpp
+++ b/lib/backupstore/BackupStoreContext.cpp
@@ -972,6 +972,8 @@ void BackupStoreContext::SaveDirectory(BackupStoreDirectory &rDir)
 		// Write to disc, adjust size in store info
 		std::string dirfn;
 		MakeObjectFilename(ObjectID, dirfn);
+		int64_t old_dir_size = rDir.GetUserInfo1_SizeInBlocks();
+
 		{
 			RaidFileWrite writeDir(mStoreDiscSet, dirfn);
 			writeDir.Open(true /* allow overwriting */);
@@ -994,6 +996,7 @@ void BackupStoreContext::SaveDirectory(BackupStoreDirectory &rDir)
 			// Update size stored in directory
 			rDir.SetUserInfo1_SizeInBlocks(dirSize);
 		}
+
 		// Refresh revision ID in cache
 		{
 			int64_t revid = 0;
@@ -1003,6 +1006,22 @@ void BackupStoreContext::SaveDirectory(BackupStoreDirectory &rDir)
 			}
 			rDir.SetRevisionID(revid);
 		}
+
+		// Update the directory entry in the grandparent, to ensure
+		// that it reflects the current size of the parent directory.
+		int64_t new_dir_size = rDir.GetUserInfo1_SizeInBlocks();
+		if(new_dir_size != old_dir_size &&
+			rDir.GetObjectID() != BACKUPSTORE_ROOT_DIRECTORY_ID)
+		{
+			BackupStoreDirectory& parent(
+				GetDirectoryInternal(rDir.GetContainerID()));
+			BackupStoreDirectory::Entry* en =
+				parent.FindEntryByID(rDir.GetObjectID());
+			ASSERT(en);
+			ASSERT(en->GetSizeInBlocks() == old_dir_size);
+			en->SetSizeInBlocks(new_dir_size);
+			SaveDirectory(parent);
+		}
 	}
 	catch(...)
 	{
@@ -1608,7 +1627,9 @@ void BackupStoreContext::SetClientStoreMarker(int64_t ClientStoreMarker)
 //		Created: 12/11/03
 //
 // --------------------------------------------------------------------------
-void BackupStoreContext::MoveObject(int64_t ObjectID, int64_t MoveFromDirectory, int64_t MoveToDirectory, const BackupStoreFilename &rNewFilename, bool MoveAllWithSameName, bool AllowMoveOverDeletedObject)
+void BackupStoreContext::MoveObject(int64_t ObjectID, int64_t MoveFromDirectory,
+	int64_t MoveToDirectory, const BackupStoreFilename &rNewFilename,
+	bool MoveAllWithSameName, bool AllowMoveOverDeletedObject)
 {
 	if(mReadOnly)
 	{
@@ -1683,8 +1704,9 @@ void BackupStoreContext::MoveObject(int64_t ObjectID, int64_t MoveFromDirectory,
 		return;
 	}
 
-	// Got to be careful how this is written, as we can't guarentte that if we have two
-	// directories open, the first won't be deleted as the second is opened. (cache)
+	// Got to be careful how this is written, as we can't guarantee that
+	// if we have two directories open, the first won't be deleted as the
+	// second is opened. (cache)
 
 	// List of entries to move
 	std::vector<BackupStoreDirectory::Entry *> moving;